diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 15:46:59 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 15:46:59 (GMT) |
commit | 2011a067281565494494aee194ca5081e52d6c3f (patch) | |
tree | e0b21ad43e6eeb0c67945026be71d1278c93c695 /arch/powerpc/kernel/setup-common.c | |
parent | 63fb70859f987f2b3b8028fa467fd63336315e9c (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
download | linux-2011a067281565494494aee194ca5081e52d6c3f.tar.xz |
Merge commit 'v2.6.28-rc2' into x86/doc
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 5ec56ff..705fc4b 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -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; } |