diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-02-04 23:35:48 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-21 15:27:06 -0800 |
commit | b6c24de77cbe9afe4962f0738e6444e709e83c81 (patch) | |
tree | 8369806f79e82bd91a80e4184972fb29f674c08c | |
parent | 82bd3f17f4600fd374524c015826c175819f15ea (diff) | |
download | linux-stable-b6c24de77cbe9afe4962f0738e6444e709e83c81.tar.gz linux-stable-b6c24de77cbe9afe4962f0738e6444e709e83c81.tar.bz2 linux-stable-b6c24de77cbe9afe4962f0738e6444e709e83c81.zip |
slabinfo: fall back from /sys/kernel/slab to /sys/slab
I keep running upstream and mm kernels and the location of the slab
directory is different since upstream still uses /sys/slab. This patch
makes slabinfo check /sys/slab if /sys/kernel/slab is not there. Makes
slabinfo work on any kernel.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | Documentation/vm/slabinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c index 7123fee708ca..22d7e3e4d60c 100644 --- a/Documentation/vm/slabinfo.c +++ b/Documentation/vm/slabinfo.c @@ -1123,7 +1123,7 @@ void read_slab_dir(void) char *t; int count; - if (chdir("/sys/kernel/slab")) + if (chdir("/sys/kernel/slab") && chdir("/sys/slab")) fatal("SYSFS support for SLUB not active\n"); dir = opendir("."); |