From: James Nelson <james4765@cwazy.co.uk>
To: linux-kernel@vger.kernel.org, kernel-janitors@lists.osdl.org
Cc: rmk+lkml@arm.linux.org.uk, James Nelson <james4765@cwazy.co.uk>
Subject: [PATCH] mach-ixp2000: remove cli()/sti()
Date: Mon, 3 Jan 2005 18:07:15 -0600 [thread overview]
Message-ID: <20050104000735.17524.96005.71130@localhost.localdomain> (raw)
Replace to-be-deprecated functions in arch/arm/mach-ixp2000/pci.c
Signed-off-by: James Nelson <james4765@gmail.com>
diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/arm/mach-ixp2000/pci.c linux-2.6.10-mm1/arch/arm/mach-ixp2000/pci.c
--- linux-2.6.10-mm1-original/arch/arm/mach-ixp2000/pci.c 2004-12-24 16:34:58.000000000 -0500
+++ linux-2.6.10-mm1/arch/arm/mach-ixp2000/pci.c 2005-01-03 18:58:52.648191137 -0500
@@ -145,7 +145,7 @@
pci_master_aborts = 1;
- cli();
+ local_irq_disable();
temp = *(IXP2000_PCI_CONTROL);
if (temp & ((1 << 8) | (1 << 5))) {
ixp2000_reg_write(IXP2000_PCI_CONTROL, temp);
@@ -158,7 +158,7 @@
temp = *(IXP2000_PCI_CMDSTAT);
}
}
- sti();
+ local_irq_enable();
/*
* If it was an imprecise abort, then we need to correct the
@@ -175,7 +175,7 @@
{
volatile u32 temp;
- cli();
+ local_irq_disable();
temp = *(IXP2000_PCI_CONTROL);
if (temp & ((1 << 8) | (1 << 5))) {
ixp2000_reg_write(IXP2000_PCI_CONTROL, temp);
@@ -188,7 +188,7 @@
temp = *(IXP2000_PCI_CMDSTAT);
}
}
- sti();
+ local_irq_enable();
return 0;
}
reply other threads:[~2005-01-04 0:15 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=20050104000735.17524.96005.71130@localhost.localdomain \
--to=james4765@cwazy.co.uk \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+lkml@arm.linux.org.uk \
/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®