Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / arch / ppc / kernel / ppc_htab.c

diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index 9b84bff..0a7e42d 100644 (file)
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -10,7 +10,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
@@ -104,7 +103,7 @@ static char *pmc2_lookup(unsigned long mmcr0)
 static int ppc_htab_show(struct seq_file *m, void *v)
 {
        unsigned long mmcr0 = 0, pmc1 = 0, pmc2 = 0;
-#if defined(CONFIG_PPC_STD_MMU) && !defined(CONFIG_PPC64BRIDGE)
+#if defined(CONFIG_PPC_STD_MMU)
        unsigned int kptes = 0, uptes = 0;
        PTE *ptr;
 #endif /* CONFIG_PPC_STD_MMU */
@@ -133,7 +132,6 @@ static int ppc_htab_show(struct seq_file *m, void *v)
                return 0;
        }
 
-#ifndef CONFIG_PPC64BRIDGE
        for (ptr = Hash; ptr < Hash_end; ptr++) {
                unsigned int mctx, vsid;
 
@@ -147,7 +145,6 @@ static int ppc_htab_show(struct seq_file *m, void *v)
                else
                        uptes++;
        }
-#endif
 
        seq_printf(m,
                      "PTE Hash Table Information\n"
@@ -155,20 +152,16 @@ static int ppc_htab_show(struct seq_file *m, void *v)
                      "Buckets\t\t: %lu\n"
                      "Address\t\t: %08lx\n"
                      "Entries\t\t: %lu\n"
-#ifndef CONFIG_PPC64BRIDGE
                      "User ptes\t: %u\n"
                      "Kernel ptes\t: %u\n"
                      "Percent full\t: %lu%%\n"
-#endif
                       , (unsigned long)(Hash_size>>10),
                      (Hash_size/(sizeof(PTE)*8)),
                      (unsigned long)Hash,
                      Hash_size/sizeof(PTE)
-#ifndef CONFIG_PPC64BRIDGE
                       , uptes,
                      kptes,
                      ((kptes+uptes)*100) / (Hash_size/sizeof(PTE))
-#endif
                );
 
        seq_printf(m,
@@ -449,17 +442,22 @@ static ctl_table htab_ctl_table[]={
                .mode           = 0644,
                .proc_handler   = &proc_dol2crvec,
        },
-       { 0, },
+       {}
 };
 static ctl_table htab_sysctl_root[] = {
-       { 1, "kernel", NULL, 0, 0755, htab_ctl_table, },
-       { 0,},
+       {
+               .ctl_name       = CTL_KERN,
+               .procname       = "kernel",
+               .mode           = 0555,
+               .child          = htab_ctl_table,
+       },
+       {}
 };
 
 static int __init
 register_ppc_htab_sysctl(void)
 {
-       register_sysctl_table(htab_sysctl_root, 0);
+       register_sysctl_table(htab_sysctl_root);
 
        return 0;
 }