summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-05-15 17:01:09 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-05-15 17:01:09 -0600
commit867aae6ebe593db73fb8a676475ee20227292cfe (patch)
tree8c1e0611698c9dddf74a8598ef7e563ee432dfaf /arch/x86
parent74d24b219bc4ebb20b75d63af2bb577bc1b10b5e (diff)
downloadlinux-867aae6ebe593db73fb8a676475ee20227292cfe.tar.gz
linux-867aae6ebe593db73fb8a676475ee20227292cfe.tar.bz2
linux-867aae6ebe593db73fb8a676475ee20227292cfe.zip
x86/PCI: only check for spinlock being held in SMP kernels
spin_is_locked() is always false on UP kernels: spin_lock_irqsave() does no locking, so we can't tell whether the lock is held or not. Therefore, this warning is only valid for SMP kernels. CC: Myron Stowe <myron.stowe@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/pci/i386.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 831971e731f7..dd8ca6f7223b 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -57,7 +57,7 @@ static struct pcibios_fwaddrmap *pcibios_fwaddrmap_lookup(struct pci_dev *dev)
{
struct pcibios_fwaddrmap *map;
- WARN_ON(!spin_is_locked(&pcibios_fwaddrmap_lock));
+ WARN_ON_SMP(!spin_is_locked(&pcibios_fwaddrmap_lock));
list_for_each_entry(map, &pcibios_fwaddrmappings, list)
if (map->dev == dev)