aboutsummaryrefslogtreecommitdiffstats
path: root/arch/h8300/mm
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2012-06-20 15:53:00 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-20 17:39:35 -0400
commitffb20313c01addc04212577af5f9b1399156a5bd (patch)
tree059ecf08116cb5e0d9e29e18f6d602ebf5310c64 /arch/h8300/mm
parentf022d0fa183c4def30ddd74f2baebd72c4254fcf (diff)
h8300: fix use of extinct _sbss and _ebss
Nowadays it should use __bss_start and __bss_stop Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/h8300/mm')
-rw-r--r--arch/h8300/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 973369c32a95..ee4c9dbf58cc 100644
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c
@@ -123,7 +123,7 @@ void __init mem_init(void)
123 int codek = 0, datak = 0, initk = 0; 123 int codek = 0, datak = 0, initk = 0;
124 /* DAVIDM look at setup memory map generically with reserved area */ 124 /* DAVIDM look at setup memory map generically with reserved area */
125 unsigned long tmp; 125 unsigned long tmp;
126 extern char _etext, _stext, _sdata, _ebss, __init_begin, __init_end; 126 extern char _etext, _stext, _sdata, __bss_stop, __init_begin, __init_end;
127 extern unsigned long _ramend, _ramstart; 127 extern unsigned long _ramend, _ramstart;
128 unsigned long len = &_ramend - &_ramstart; 128 unsigned long len = &_ramend - &_ramstart;
129 unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */ 129 unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
@@ -143,7 +143,7 @@ void __init mem_init(void)
143 totalram_pages = free_all_bootmem(); 143 totalram_pages = free_all_bootmem();
144 144
145 codek = (&_etext - &_stext) >> 10; 145 codek = (&_etext - &_stext) >> 10;
146 datak = (&_ebss - &_sdata) >> 10; 146 datak = (&__bss_stop - &_sdata) >> 10;
147 initk = (&__init_begin - &__init_end) >> 10; 147 initk = (&__init_begin - &__init_end) >> 10;
148 148
149 tmp = nr_free_pages() << PAGE_SHIFT; 149 tmp = nr_free_pages() << PAGE_SHIFT;