Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / arch / sh / kernel / setup.c

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 4e27846..d6b018c 100644 (file)
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -41,6 +41,7 @@
 #include <asm/smp.h>
 #include <asm/mmu_context.h>
 #include <asm/mmzone.h>
+#include <asm/sparsemem.h>
 
 /*
  * Initialize loops_per_jiffy as 10000000 (1000MIPS).
@@ -52,6 +53,7 @@ struct sh_cpuinfo cpu_data[NR_CPUS] __read_mostly = {
                .type                   = CPU_SH_NONE,
                .family                 = CPU_FAMILY_UNKNOWN,
                .loops_per_jiffy        = 10000000,
+               .phys_bits              = MAX_PHYSMEM_BITS,
        },
 };
 EXPORT_SYMBOL(cpu_data);
@@ -432,6 +434,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
        if (c->flags & CPU_HAS_L2_CACHE)
                show_cacheinfo(m, "scache", c->scache);
 
+       seq_printf(m, "address sizes\t: %u bits physical\n", c->phys_bits);
+
        seq_printf(m, "bogomips\t: %lu.%02lu\n",
                     c->loops_per_jiffy/(500000/HZ),
                     (c->loops_per_jiffy/(5000/HZ)) % 100);