提交 ffb20313 编写于 作者: G Geert Uytterhoeven 提交者: Linus Torvalds

h8300: fix use of extinct _sbss and _ebss

Nowadays it should use __bss_start and __bss_stop
Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 f022d0fa
...@@ -54,7 +54,7 @@ unsigned long memory_end; ...@@ -54,7 +54,7 @@ unsigned long memory_end;
char __initdata command_line[COMMAND_LINE_SIZE]; char __initdata command_line[COMMAND_LINE_SIZE];
extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end; extern int _stext, _etext, _sdata, _edata, __bss_start, __bss_stop, _end;
extern int _ramstart, _ramend; extern int _ramstart, _ramend;
extern char _target_name[]; extern char _target_name[];
extern void h8300_gpio_init(void); extern void h8300_gpio_init(void);
...@@ -137,10 +137,10 @@ void __init setup_arch(char **cmdline_p) ...@@ -137,10 +137,10 @@ void __init setup_arch(char **cmdline_p)
printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x " printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x "
"BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext, "BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext,
(int) &_sdata, (int) &_edata, (int) &_sdata, (int) &_edata,
(int) &_sbss, (int) &_ebss); (int) &__bss_start, (int) &__bss_stop);
printk(KERN_DEBUG "KERNEL -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x " printk(KERN_DEBUG "KERNEL -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x "
"STACK=0x%06x-0x%06x\n", "STACK=0x%06x-0x%06x\n",
(int) &_ebss, (int) memory_start, (int) &__bss_stop, (int) memory_start,
(int) memory_start, (int) memory_end, (int) memory_start, (int) memory_end,
(int) memory_end, (int) &_ramend); (int) memory_end, (int) &_ramend);
#endif #endif
......
...@@ -123,7 +123,7 @@ void __init mem_init(void) ...@@ -123,7 +123,7 @@ void __init mem_init(void)
int codek = 0, datak = 0, initk = 0; int codek = 0, datak = 0, initk = 0;
/* DAVIDM look at setup memory map generically with reserved area */ /* DAVIDM look at setup memory map generically with reserved area */
unsigned long tmp; unsigned long tmp;
extern char _etext, _stext, _sdata, _ebss, __init_begin, __init_end; extern char _etext, _stext, _sdata, __bss_stop, __init_begin, __init_end;
extern unsigned long _ramend, _ramstart; extern unsigned long _ramend, _ramstart;
unsigned long len = &_ramend - &_ramstart; unsigned long len = &_ramend - &_ramstart;
unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */ unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
...@@ -143,7 +143,7 @@ void __init mem_init(void) ...@@ -143,7 +143,7 @@ void __init mem_init(void)
totalram_pages = free_all_bootmem(); totalram_pages = free_all_bootmem();
codek = (&_etext - &_stext) >> 10; codek = (&_etext - &_stext) >> 10;
datak = (&_ebss - &_sdata) >> 10; datak = (&__bss_stop - &_sdata) >> 10;
initk = (&__init_begin - &__init_end) >> 10; initk = (&__init_begin - &__init_end) >> 10;
tmp = nr_free_pages() << PAGE_SHIFT; tmp = nr_free_pages() << PAGE_SHIFT;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册