summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-02-05 08:35:48 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-22 00:27:06 +0100
commitb6c24de77cbe9afe4962f0738e6444e709e83c81 (patch)
tree8369806f79e82bd91a80e4184972fb29f674c08c /Documentation
parentFix broken utf-8 encodings in ja_JP translation of stable_kernel_rules.txt (diff)
downloadlinux-b6c24de77cbe9afe4962f0738e6444e709e83c81.tar.xz
linux-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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/vm/slabinfo.c2
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(".");