From: James Nelson <james4765@cwazy.co.uk>
To: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org
Cc: paulus@samba.org, James Nelson <james4765@cwazy.co.uk>
Subject: [PATCH 7/7] ppc: remove cli()/sti() in arch/ppc/syslib/qspan_pci.c
Date: Tue, 4 Jan 2005 15:41:26 -0600 [thread overview]
Message-ID: <20050104214144.21749.45711.82235@localhost.localdomain> (raw)
In-Reply-To: <20050104214048.21749.85722.89116@localhost.localdomain>
Signed-off-by: James Nelson <james4765@gmail.com>
diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/ppc/syslib/qspan_pci.c linux-2.6.10-mm1/arch/ppc/syslib/qspan_pci.c
--- linux-2.6.10-mm1-original/arch/ppc/syslib/qspan_pci.c 2004-12-24 16:34:26.000000000 -0500
+++ linux-2.6.10-mm1/arch/ppc/syslib/qspan_pci.c 2005-01-03 19:13:30.256710849 -0500
@@ -109,8 +109,7 @@
}
#ifdef CONFIG_RPXCLASSIC
- save_flags(flags);
- cli();
+ local_irq_save(flags);
*((uint *)RPX_CSR_ADDR) &= ~BCSR2_QSPACESEL;
eieio();
#endif
@@ -124,7 +123,7 @@
#ifdef CONFIG_RPXCLASSIC
*((uint *)RPX_CSR_ADDR) |= BCSR2_QSPACESEL;
eieio();
- restore_flags(flags);
+ local_irq_restore(flags);
#endif
offset ^= 0x03;
@@ -148,8 +147,7 @@
}
#ifdef CONFIG_RPXCLASSIC
- save_flags(flags);
- cli();
+ local_irq_save(flags);
*((uint *)RPX_CSR_ADDR) &= ~BCSR2_QSPACESEL;
eieio();
#endif
@@ -164,7 +162,7 @@
#ifdef CONFIG_RPXCLASSIC
*((uint *)RPX_CSR_ADDR) |= BCSR2_QSPACESEL;
eieio();
- restore_flags(flags);
+ local_irq_restore(flags);
#endif
sp = ((ushort *)&temp) + ((offset >> 1) & 1);
@@ -185,8 +183,7 @@
}
#ifdef CONFIG_RPXCLASSIC
- save_flags(flags);
- cli();
+ local_irq_save(flags);
*((uint *)RPX_CSR_ADDR) &= ~BCSR2_QSPACESEL;
eieio();
#endif
@@ -200,7 +197,7 @@
#ifdef CONFIG_RPXCLASSIC
*((uint *)RPX_CSR_ADDR) |= BCSR2_QSPACESEL;
eieio();
- restore_flags(flags);
+ local_irq_restore(flags);
#endif
return PCIBIOS_SUCCESSFUL;
@@ -225,8 +222,7 @@
*cp = val;
#ifdef CONFIG_RPXCLASSIC
- save_flags(flags);
- cli();
+ local_irq_save(flags);
*((uint *)RPX_CSR_ADDR) &= ~BCSR2_QSPACESEL;
eieio();
#endif
@@ -240,7 +236,7 @@
#ifdef CONFIG_RPXCLASSIC
*((uint *)RPX_CSR_ADDR) |= BCSR2_QSPACESEL;
eieio();
- restore_flags(flags);
+ local_irq_restore(flags);
#endif
return PCIBIOS_SUCCESSFUL;
@@ -265,8 +261,7 @@
*sp = val;
#ifdef CONFIG_RPXCLASSIC
- save_flags(flags);
- cli();
+ local_irq_save(flags);
*((uint *)RPX_CSR_ADDR) &= ~BCSR2_QSPACESEL;
eieio();
#endif
@@ -280,7 +275,7 @@
#ifdef CONFIG_RPXCLASSIC
*((uint *)RPX_CSR_ADDR) |= BCSR2_QSPACESEL;
eieio();
- restore_flags(flags);
+ local_irq_restore(flags);
#endif
return PCIBIOS_SUCCESSFUL;
@@ -297,8 +292,7 @@
return PCIBIOS_DEVICE_NOT_FOUND;
#ifdef CONFIG_RPXCLASSIC
- save_flags(flags);
- cli();
+ local_irq_save(flags);
*((uint *)RPX_CSR_ADDR) &= ~BCSR2_QSPACESEL;
eieio();
#endif
@@ -312,7 +306,7 @@
#ifdef CONFIG_RPXCLASSIC
*((uint *)RPX_CSR_ADDR) |= BCSR2_QSPACESEL;
eieio();
- restore_flags(flags);
+ local_irq_restore(flags);
#endif
return PCIBIOS_SUCCESSFUL;
next prev parent reply other threads:[~2005-01-04 21:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-04 21:40 [PATCH 0/7] ppc: remove cli()/sti() from arch/ppc/* James Nelson
2005-01-04 21:40 ` [PATCH 1/7] ppc: remove cli()/sti() in arch/ppc/4xx_io/serial_sicc.c James Nelson
2005-01-04 21:40 ` [PATCH 2/7] ppc: remove cli()/sti() in arch/ppc/8xx_io/cs4218_tdm.c James Nelson
2005-01-04 21:40 ` [PATCH 3/7] ppc: remove cli()/sti() in arch/ppc/8xx_io/fec.c James Nelson
2005-01-04 21:40 ` [PATCH 4/7] ppc: remove cli()/sti() in arch/ppc/platforms/apus_setup.c James Nelson
2005-01-04 21:41 ` [PATCH 5/7] ppc: remove cli()/sti() in arch/ppc/platforms/pal4_setup.c James Nelson
2005-01-04 21:41 ` [PATCH 6/7] ppc: remove cli()/sti() in arch/ppc/syslib/m8xx_setup.c James Nelson
2005-01-04 21:41 ` James Nelson [this message]
2005-01-05 2:19 ` [PATCH 0/7] ppc: remove cli()/sti() from arch/ppc/* Brian Gerst
2005-01-05 2:44 ` Jim Nelson
2005-01-05 9:26 ` Christoph Hellwig
2005-01-05 11:19 ` Jim Nelson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050104214144.21749.45711.82235@localhost.localdomain \
--to=james4765@cwazy.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®