[PATCH tip/core/rcu 1/7] x86/PCI: Replace spin_is_locked() with lockdep

[Paul E. McKenney]

From: Lance Roy 

lockdep_assert_held() is better suited to checking locking requirements,
since it only checks if the current thread holds the lock regardless of
whether someone else does. This is also a step towards possibly removing
spin_is_locked().

Signed-off-by: Lance Roy 
Cc: Bjorn Helgaas 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: Borislav Petkov 
Cc: "H. Peter Anvin" 
Cc: 
Cc: 
Signed-off-by: Paul E. McKenney 
---
 arch/x86/pci/i386.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 8cd66152cdb0..9df652d3d927 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -59,7 +59,7 @@ static struct pcibios_fwaddrmap 
*pcibios_fwaddrmap_lookup(struct pci_dev *dev)
 {
struct pcibios_fwaddrmap *map;
 
-   WARN_ON_SMP(!spin_is_locked(_fwaddrmap_lock));
+   lockdep_assert_held(_fwaddrmap_lock);
 
list_for_each_entry(map, _fwaddrmappings, list)
if (map->dev == dev)
-- 
2.17.1

[PATCH tip/core/rcu 1/7] x86/PCI: Replace spin_is_locked() with lockdep

[Paul E. McKenney]

From: Lance Roy 

lockdep_assert_held() is better suited to checking locking requirements,
since it only checks if the current thread holds the lock regardless of
whether someone else does. This is also a step towards possibly removing
spin_is_locked().

Signed-off-by: Lance Roy 
Cc: Bjorn Helgaas 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: Borislav Petkov 
Cc: "H. Peter Anvin" 
Cc: 
Cc: 
Signed-off-by: Paul E. McKenney 
---
 arch/x86/pci/i386.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 8cd66152cdb0..9df652d3d927 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -59,7 +59,7 @@ static struct pcibios_fwaddrmap 
*pcibios_fwaddrmap_lookup(struct pci_dev *dev)
 {
struct pcibios_fwaddrmap *map;
 
-   WARN_ON_SMP(!spin_is_locked(_fwaddrmap_lock));
+   lockdep_assert_held(_fwaddrmap_lock);
 
list_for_each_entry(map, _fwaddrmappings, list)
if (map->dev == dev)
-- 
2.17.1