summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2005-11-07 17:43:07 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-08 11:19:53 +1100
commitbcb3557694d4e880051795ad97d609d255bcb658 (patch)
treeb79b550546b1330c828cd163ac624c6dc42a992a /arch
parent42596ec5edc8efb9e24397ef656df7ebb2c4f8d5 (diff)
downloadlinux-bcb3557694d4e880051795ad97d609d255bcb658.tar.gz
linux-bcb3557694d4e880051795ad97d609d255bcb658.tar.bz2
linux-bcb3557694d4e880051795ad97d609d255bcb658.zip
[PATCH] ppc64: fix Memory: summary line
On ppc64 we end up with a negative value for the data size in the memory boot message: Memory: 2035560k/2097152k available (5792k kernel code, 89564k reserved, 18014398509481632k data, 870k bss, 352k init) It turns out the section ordering of the linker script is different on ppc32 and ppc64, so just count data as _edata - _sdata which should work on both. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/mm/mem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 7faa46b71f21..6f55efd9be95 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -358,7 +358,7 @@ void __init mem_init(void)
}
codesize = (unsigned long)&_sdata - (unsigned long)&_stext;
- datasize = (unsigned long)&__init_begin - (unsigned long)&_sdata;
+ datasize = (unsigned long)&_edata - (unsigned long)&_sdata;
initsize = (unsigned long)&__init_end - (unsigned long)&__init_begin;
bsssize = (unsigned long)&__bss_stop - (unsigned long)&__bss_start;