aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/vm/slabinfo.c2
-rw-r--r--Documentation/vm/slub.txt2
-rw-r--r--mm/slub.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c
index 7047696c47a1..488c1f31b992 100644
--- a/Documentation/vm/slabinfo.c
+++ b/Documentation/vm/slabinfo.c
@@ -1021,7 +1021,7 @@ void read_slab_dir(void)
1021 char *t; 1021 char *t;
1022 int count; 1022 int count;
1023 1023
1024 if (chdir("/sys/slab")) 1024 if (chdir("/sys/kernel/slab"))
1025 fatal("SYSFS support for SLUB not active\n"); 1025 fatal("SYSFS support for SLUB not active\n");
1026 1026
1027 dir = opendir("."); 1027 dir = opendir(".");
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt
index d17f324db9f5..dcf8bcf846d6 100644
--- a/Documentation/vm/slub.txt
+++ b/Documentation/vm/slub.txt
@@ -63,7 +63,7 @@ In case you forgot to enable debugging on the kernel command line: It is
63possible to enable debugging manually when the kernel is up. Look at the 63possible to enable debugging manually when the kernel is up. Look at the
64contents of: 64contents of:
65 65
66/sys/slab/<slab name>/ 66/sys/kernel/slab/<slab name>/
67 67
68Look at the writable files. Writing 1 to them will enable the 68Look at the writable files. Writing 1 to them will enable the
69corresponding debug option. All options can be set on a slab that does 69corresponding debug option. All options can be set on a slab that does
diff --git a/mm/slub.c b/mm/slub.c
index 886131c5b5ca..b6c79462157e 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4091,7 +4091,8 @@ static int __init slab_sysfs_init(void)
4091 struct kmem_cache *s; 4091 struct kmem_cache *s;
4092 int err; 4092 int err;
4093 4093
4094 slab_kset = kset_create_and_add("slab", &slab_uevent_ops, NULL); 4094 slab_kset = kset_create_and_add("slab", &slab_uevent_ops,
4095 &kernel_kset->kobj);
4095 if (!slab_kset) { 4096 if (!slab_kset) {
4096 printk(KERN_ERR "Cannot register slab subsystem.\n"); 4097 printk(KERN_ERR "Cannot register slab subsystem.\n");
4097 return -ENOSYS; 4098 return -ENOSYS;