kset: move /sys/slab to /sys/kernel/slab

/sys/kernel is where these things should go.
Also updated the documentation and tool that used this directory.

Cc: Kay Sievers <[email protected]>
Acked-by: Christoph Lameter <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c
index 7047696c47a18b6172549c9174b5988a7c2881c4..488c1f31b99249b75a9686cf42f08329bea896c9 100644 (file)
--- a/Documentation/vm/slabinfo.c
+++ b/Documentation/vm/slabinfo.c
@@ -1021,7 +1021,7 @@ void read_slab_dir(void)
        char *t;
        int count;
 
-       if (chdir("/sys/slab"))
+       if (chdir("/sys/kernel/slab"))
                fatal("SYSFS support for SLUB not active\n");
 
        dir = opendir(".");

diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt
index d17f324db9f51a538daccf3619b2eed445890525..dcf8bcf846d6a5486b737c840b4dce7d71ae89e2 100644 (file)
--- 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
 possible to enable debugging manually when the kernel is up. Look at the
 contents of:
 
-/sys/slab/<slab name>/
+/sys/kernel/slab/<slab name>/
 
 Look at the writable files. Writing 1 to them will enable the
 corresponding debug option. All options can be set on a slab that does

diff --git a/mm/slub.c b/mm/slub.c
index 886131c5b5ca06465f82bcc1407305b6286451d0..b6c79462157e85637016ea07e0ee646455b8f6d9 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4091,7 +4091,8 @@ static int __init slab_sysfs_init(void)
        struct kmem_cache *s;
        int err;
 
-       slab_kset = kset_create_and_add("slab", &slab_uevent_ops, NULL);
+       slab_kset = kset_create_and_add("slab", &slab_uevent_ops,
+                                       &kernel_kset->kobj);
        if (!slab_kset) {
                printk(KERN_ERR "Cannot register slab subsystem.\n");
                return -ENOSYS;