Merge branch 'slab/rcu' into slab/next

Conflicts:
	mm/slub.c

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 8ecaac983923..ea25e5bfcf23 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/capability.h>
+#include <linux/security.h>
 #include <linux/pci-aspm.h>
 #include <linux/slab.h>
 #include "pci.h"
@@ -368,7 +369,7 @@ pci_read_config(struct file *filp, struct kobject *kobj,
         u8 *data = (u8*) buf;
 
         /* Several chips lock up trying to read undefined config space */
-        if (cap_raised(filp->f_cred->cap_effective, CAP_SYS_ADMIN)) {
+        if (security_capable(filp->f_cred, CAP_SYS_ADMIN) == 0) {
                 size = dev->cfg_size;
         } else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
                 size = 128;