Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / arch / sh / mm / asids-debugfs.c

diff --git a/arch/sh/mm/asids-debugfs.c b/arch/sh/mm/asids-debugfs.c
index 8e912a15e94f4583e1f4a8fe488b1dc45128e766..74c03ecc48718c6e41abb7b59f50f715eb992681 100644 (file)
--- a/arch/sh/mm/asids-debugfs.c
+++ b/arch/sh/mm/asids-debugfs.c
@@ -37,10 +37,8 @@ static int asids_seq_show(struct seq_file *file, void *iter)
                        continue;
 
                if (p->mm)
-                       seq_printf(file, "%5d : %02lx\n", pid,
+                       seq_printf(file, "%5d : %04lx\n", pid,
                                   cpu_asid(smp_processor_id(), p->mm));
-               else
-                       seq_printf(file, "%5d : (none)\n", pid);
        }
 
        read_unlock(&tasklist_lock);
@@ -65,7 +63,7 @@ static int __init asids_debugfs_init(void)
 {
        struct dentry *asids_dentry;
 
-       asids_dentry = debugfs_create_file("asids", S_IRUSR, sh_debugfs_root,
+       asids_dentry = debugfs_create_file("asids", S_IRUSR, arch_debugfs_dir,
                                           NULL, &asids_debugfs_fops);
        if (!asids_dentry)
                return -ENOMEM;