Commit:     b6c24de77cbe9afe4962f0738e6444e709e83c81
Parent:     82bd3f17f4600fd374524c015826c175819f15ea
Author:     Christoph Lameter <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 23:35:48 2008 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Thu Feb 21 15:27:06 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 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 7123fee..22d7e3e 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(".");
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to