Merge branch 'master' into tk71

[mv-sheeva.git] / tools / slub / slabinfo.c

diff --git a/Documentation/vm/slabinfo.c b/tools/slub/slabinfo.c
similarity index 99%
rename from Documentation/vm/slabinfo.c
rename to tools/slub/slabinfo.c
index 92e729f4b676e39851a06760626915950a561035..516551c9f1722f76eeaab3be04164e8ed62ee75e 100644 (file)
--- a/Documentation/vm/slabinfo.c
+++ b/tools/slub/slabinfo.c
@@ -607,7 +607,7 @@ static int debug_opt_scan(char *opt)
        }
 
        for ( ; *opt; opt++)
-               switch (*opt) {
+               switch (*opt) {
                case 'F' : case 'f':
                        if (sanity)
                                return 0;
@@ -1127,7 +1127,7 @@ static void read_slab_dir(void)
                                continue;
                switch (de->d_type) {
                   case DT_LNK:
-                       alias->name = strdup(de->d_name);
+                       alias->name = strdup(de->d_name);
                        count = readlink(de->d_name, buffer, sizeof(buffer));
 
                        if (count < 0)
@@ -1143,7 +1143,7 @@ static void read_slab_dir(void)
                   case DT_DIR:
                        if (chdir(de->d_name))
                                fatal("Unable to access slab %s\n", slab->name);
-                       slab->name = strdup(de->d_name);
+                       slab->name = strdup(de->d_name);
                        slab->alias = 0;
                        slab->refs = 0;
                        slab->aliases = get_obj("aliases");