From: James Nelson <james4765@cwazy.co.uk>
To: linux-kernel@vger.kernel.org, linux-sh@m17n.org
Cc: lethal@linux-sh.org, James Nelson <james4765@cwazy.co.uk>
Subject: [PATCH] sh: remove cli()/sti() in arch/sh/boards/mpc1211/setup.c
Date: Tue, 4 Jan 2005 19:10:33 -0600 [thread overview]
Message-ID: <20050105011053.22124.23492.17036@localhost.localdomain> (raw)
Signed-off-by: James Nelson <james4765@gmail.com>
diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/sh/boards/mpc1211/setup.c linux-2.6.10-mm1/arch/sh/boards/mpc1211/setup.c
--- linux-2.6.10-mm1-original/arch/sh/boards/mpc1211/setup.c 2004-12-24 16:34:01.000000000 -0500
+++ linux-2.6.10-mm1/arch/sh/boards/mpc1211/setup.c 2005-01-04 20:06:16.543941867 -0500
@@ -83,7 +83,7 @@
{
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
if( irq < 8) {
m_irq_mask |= (1 << irq);
outb(m_irq_mask,I8259_M_MR);
@@ -91,7 +91,7 @@
s_irq_mask |= (1 << (irq - 8));
outb(s_irq_mask,I8259_S_MR);
}
- restore_flags(flags);
+ local_irq_restore(flags);
}
@@ -99,7 +99,7 @@
{
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
if( irq < 8) {
m_irq_mask &= ~(1 << irq);
@@ -108,7 +108,7 @@
s_irq_mask &= ~(1 << (irq - 8));
outb(s_irq_mask,I8259_S_MR);
}
- restore_flags(flags);
+ local_irq_restore(flags);
}
static inline int mpc1211_irq_real(unsigned int irq)
@@ -134,7 +134,7 @@
{
unsigned long flags;
- save_and_cli(flags);
+ local_irq_save(flags);
if(irq < 8) {
if(m_irq_mask & (1<<irq)){
@@ -163,7 +163,7 @@
outb(0x60+(irq-8),I8259_S_CR); /* EOI */
outb(0x60+2,I8259_M_CR);
}
- restore_flags(flags);
+ local_irq_restore(flags);
}
static void end_mpc1211_irq(unsigned int irq)
reply other threads:[~2005-01-05 1:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20050105011053.22124.23492.17036@localhost.localdomain \
--to=james4765@cwazy.co.uk \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@m17n.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®