Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f465df81 authored by Becky Bruce's avatar Becky Bruce Committed by Benjamin Herrenschmidt
Browse files

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: default avatarBecky Bruce <becky.bruce@freescale.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 934752d8

arch/powerpc/kernel/setup-common.c

+7 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <asm/mmu.h>

#include <asm/xmon.h>

#include <asm/cputhreads.h>

#include <mm/mmu_decl.h>



#include "setup.h"
@@ -190,6 +191,12 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		if (ppc_md.show_cpuinfo != NULL)

			ppc_md.show_cpuinfo(m);



#ifdef CONFIG_PPC32

		/* Display the amount of memory */

		seq_printf(m, "Memory\t\t: %d MB\n",

			   (unsigned int)(total_memory / (1024 * 1024)));

#endif



		return 0;

	}

arch/powerpc/platforms/85xx/ksi8560.c

+0 −4
Original line number Diff line number Diff line
@@ -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[] = {

arch/powerpc/platforms/85xx/mpc85xx_ads.c

+0 −4
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static void __init mpc85xx_ads_setup_arch(void) 
static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)

{

	uint pvid, svid, phid1;

	uint memsize = total_memory;



	pvid = mfspr(SPRN_PVR);

	svid = mfspr(SPRN_SVR);
@@ -219,9 +218,6 @@ static void mpc85xx_ads_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[] = {

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+0 −4
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ static void __init mpc85xx_cds_setup_arch(void) 
static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)

{

	uint pvid, svid, phid1;

	uint memsize = total_memory;



	pvid = mfspr(SPRN_PVR);

	svid = mfspr(SPRN_SVR);
@@ -320,9 +319,6 @@ static void mpc85xx_cds_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));

}

arch/powerpc/platforms/85xx/sbc8548.c

+0 −4
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ static void __init sbc8548_setup_arch(void) 
static void sbc8548_show_cpuinfo(struct seq_file *m)

{

	uint pvid, svid, phid1;

	uint memsize = total_memory;



	pvid = mfspr(SPRN_PVR);

	svid = mfspr(SPRN_SVR);
@@ -149,9 +148,6 @@ static void sbc8548_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[] = {