lkml.org 
[lkml]   [2005]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] mach-ixp2000: remove cli()/sti()
Date
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;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:09    [W:0.420 / U:0.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site