Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[~andy/linux] / drivers / pci / bus.c

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 712250f5874a88f0acd238429cd6237139a986f9..628ea20a884190afbbffff2f80e0faf5cbaade1b 100644 (file)
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -14,6 +14,7 @@
 #include <linux/ioport.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #include "pci.h"
 
@@ -288,9 +289,9 @@ void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *),
                        next = dev->bus_list.next;
 
                /* Run device routines with the device locked */
-               down(&dev->dev.sem);
+               device_lock(&dev->dev);
                retval = cb(dev, userdata);
-               up(&dev->dev.sem);
+               device_unlock(&dev->dev);
                if (retval)
                        break;
        }