diff options
author | Becky Bruce <becky.bruce@freescale.com> | 2008-10-15 04:25:28 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 20:00:25 -0400 |
commit | f465df81a80df92dbde0029b277f31b5e787b5df (patch) | |
tree | 67839adda26126b4e95b11e5a79d9dfc57a81014 /arch/powerpc/platforms/86xx | |
parent | 934752d8a4aaae4bee7a1b46944f30a55178ec91 (diff) |
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/86xx')
-rw-r--r-- | arch/powerpc/platforms/86xx/gef_sbc610.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/sbc8641d.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c index 821c45fac18b..fb371f5ce132 100644 --- a/arch/powerpc/platforms/86xx/gef_sbc610.c +++ b/arch/powerpc/platforms/86xx/gef_sbc610.c | |||
@@ -127,7 +127,6 @@ static unsigned int gef_sbc610_get_fpga_rev(void) | |||
127 | 127 | ||
128 | static void gef_sbc610_show_cpuinfo(struct seq_file *m) | 128 | static void gef_sbc610_show_cpuinfo(struct seq_file *m) |
129 | { | 129 | { |
130 | uint memsize = total_memory; | ||
131 | uint svid = mfspr(SPRN_SVR); | 130 | uint svid = mfspr(SPRN_SVR); |
132 | 131 | ||
133 | seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n"); | 132 | seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n"); |
@@ -137,7 +136,6 @@ static void gef_sbc610_show_cpuinfo(struct seq_file *m) | |||
137 | seq_printf(m, "FPGA Revision\t: %u\n", gef_sbc610_get_fpga_rev()); | 136 | seq_printf(m, "FPGA Revision\t: %u\n", gef_sbc610_get_fpga_rev()); |
138 | 137 | ||
139 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); | 138 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); |
140 | seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024)); | ||
141 | } | 139 | } |
142 | 140 | ||
143 | static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev) | 141 | static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev) |
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index 2672829a71dc..27e0e682d8e1 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | |||
@@ -101,13 +101,11 @@ mpc86xx_hpcn_setup_arch(void) | |||
101 | static void | 101 | static void |
102 | mpc86xx_hpcn_show_cpuinfo(struct seq_file *m) | 102 | mpc86xx_hpcn_show_cpuinfo(struct seq_file *m) |
103 | { | 103 | { |
104 | uint memsize = total_memory; | ||
105 | uint svid = mfspr(SPRN_SVR); | 104 | uint svid = mfspr(SPRN_SVR); |
106 | 105 | ||
107 | seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n"); | 106 | seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n"); |
108 | 107 | ||
109 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); | 108 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); |
110 | seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024)); | ||
111 | } | 109 | } |
112 | 110 | ||
113 | 111 | ||
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c index da677a74e2d1..5fd7ed40986f 100644 --- a/arch/powerpc/platforms/86xx/sbc8641d.c +++ b/arch/powerpc/platforms/86xx/sbc8641d.c | |||
@@ -63,13 +63,11 @@ sbc8641_setup_arch(void) | |||
63 | static void | 63 | static void |
64 | sbc8641_show_cpuinfo(struct seq_file *m) | 64 | sbc8641_show_cpuinfo(struct seq_file *m) |
65 | { | 65 | { |
66 | uint memsize = total_memory; | ||
67 | uint svid = mfspr(SPRN_SVR); | 66 | uint svid = mfspr(SPRN_SVR); |
68 | 67 | ||
69 | seq_printf(m, "Vendor\t\t: Wind River Systems\n"); | 68 | seq_printf(m, "Vendor\t\t: Wind River Systems\n"); |
70 | 69 | ||
71 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); | 70 | seq_printf(m, "SVR\t\t: 0x%x\n", svid); |
72 | seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024)); | ||
73 | } | 71 | } |
74 | 72 | ||
75 | 73 | ||