Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / x86 / pci / pcbios.c

diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 59a225c..2492d16 100644 (file)
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -162,7 +162,7 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
        if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
                return -EINVAL;
 
-       spin_lock_irqsave(&pci_config_lock, flags);
+       raw_spin_lock_irqsave(&pci_config_lock, flags);
 
        switch (len) {
        case 1:
@@ -213,7 +213,7 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
                break;
        }
 
-       spin_unlock_irqrestore(&pci_config_lock, flags);
+       raw_spin_unlock_irqrestore(&pci_config_lock, flags);
 
        return (int)((result & 0xff00) >> 8);
 }
@@ -228,7 +228,7 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
        if ((bus > 255) || (devfn > 255) || (reg > 255)) 
                return -EINVAL;
 
-       spin_lock_irqsave(&pci_config_lock, flags);
+       raw_spin_lock_irqsave(&pci_config_lock, flags);
 
        switch (len) {
        case 1:
@@ -269,7 +269,7 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
                break;
        }
 
-       spin_unlock_irqrestore(&pci_config_lock, flags);
+       raw_spin_unlock_irqrestore(&pci_config_lock, flags);
 
        return (int)((result & 0xff00) >> 8);
 }