From 95aff7ad4622fc20d12c302355bbbc9bf783ac9e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 1 Nov 2007 09:29:06 -0600 Subject: [PATCH] --- yaml --- r: 75756 b: refs/heads/master c: 081248de0a0288a0ce4e1447a07ccf56aa4fae01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/vm/slabinfo.c | 2 +- trunk/Documentation/vm/slub.txt | 2 +- trunk/mm/slub.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b21cf5043ce5..cd0edb8504c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27c3a314d55b810f3b51902d1d815c714a7afbd2 +refs/heads/master: 081248de0a0288a0ce4e1447a07ccf56aa4fae01 diff --git a/trunk/Documentation/vm/slabinfo.c b/trunk/Documentation/vm/slabinfo.c index 7047696c47a1..488c1f31b992 100644 --- a/trunk/Documentation/vm/slabinfo.c +++ b/trunk/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/trunk/Documentation/vm/slub.txt b/trunk/Documentation/vm/slub.txt index d17f324db9f5..dcf8bcf846d6 100644 --- a/trunk/Documentation/vm/slub.txt +++ b/trunk/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// +/sys/kernel/slab// 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/trunk/mm/slub.c b/trunk/mm/slub.c index 886131c5b5ca..b6c79462157e 100644 --- a/trunk/mm/slub.c +++ b/trunk/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;