Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

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

diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
index 90d5fd4..a3d9c54 100644 (file)
--- a/arch/x86/pci/mmconfig_32.c
+++ b/arch/x86/pci/mmconfig_32.c
@@ -64,7 +64,7 @@ err:          *value = -1;
        if (!base)
                goto err;
 
-       spin_lock_irqsave(&pci_config_lock, flags);
+       raw_spin_lock_irqsave(&pci_config_lock, flags);
 
        pci_exp_set_dev_base(base, bus, devfn);
 
@@ -79,7 +79,7 @@ err:          *value = -1;
                *value = mmio_config_readl(mmcfg_virt_addr + reg);
                break;
        }
-       spin_unlock_irqrestore(&pci_config_lock, flags);
+       raw_spin_unlock_irqrestore(&pci_config_lock, flags);
 
        return 0;
 }
@@ -97,7 +97,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
        if (!base)
                return -EINVAL;
 
-       spin_lock_irqsave(&pci_config_lock, flags);
+       raw_spin_lock_irqsave(&pci_config_lock, flags);
 
        pci_exp_set_dev_base(base, bus, devfn);
 
@@ -112,7 +112,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
                mmio_config_writel(mmcfg_virt_addr + reg, value);
                break;
        }
-       spin_unlock_irqrestore(&pci_config_lock, flags);
+       raw_spin_unlock_irqrestore(&pci_config_lock, flags);
 
        return 0;
 }