diff options
| author | Becky Bruce | 2008-10-15 10:25:28 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2008-10-22 02:00:25 +0200 |
| commit | f465df81a80df92dbde0029b277f31b5e787b5df (patch) | |
| tree | 67839adda26126b4e95b11e5a79d9dfc57a81014 /arch/powerpc/platforms/85xx/ksi8560.c | |
| parent | hvc_console: Remove __devexit annotation of hvc_remove() (diff) | |
| download | kernel-qcow2-linux-f465df81a80df92dbde0029b277f31b5e787b5df.tar.gz kernel-qcow2-linux-f465df81a80df92dbde0029b277f31b5e787b5df.tar.xz kernel-qcow2-linux-f465df81a80df92dbde0029b277f31b5e787b5df.zip | |
powerpc: Move memory size print into common show_cpuinfo for 32-bit
Most of the platforms were printing the size of the memory
in their show_cpuinfo implementations. This moves that to
the common show_cpuinfo, so that all 32-bit platforms will
now print the size of memory. I also update the code
to deal with the fact that total_memory is now a phys_addr_t.
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/ksi8560.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/ksi8560.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c index 8a3b117b6ce2..81cee7bbf2d2 100644 --- a/arch/powerpc/platforms/85xx/ksi8560.c +++ b/arch/powerpc/platforms/85xx/ksi8560.c @@ -193,7 +193,6 @@ static void __init ksi8560_setup_arch(void) static void ksi8560_show_cpuinfo(struct seq_file *m) { uint pvid, svid, phid1; - uint memsize = total_memory; pvid = mfspr(SPRN_PVR); svid = mfspr(SPRN_SVR); @@ -215,9 +214,6 @@ static void ksi8560_show_cpuinfo(struct seq_file *m) /* Display cpu Pll setting */ phid1 = mfspr(SPRN_HID1); seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); - - /* Display the amount of memory */ - seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024)); } static struct of_device_id __initdata of_bus_ids[] = { |