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

Commit ffb20313 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

h8300: fix use of extinct _sbss and _ebss 



Nowadays it should use __bss_start and __bss_stop

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f022d0fa

arch/h8300/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ unsigned long memory_end; 


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 char _target_name[];

extern void h8300_gpio_init(void);
@@ -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 "

		"BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext,

		(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 "

		"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_end, (int) &_ramend);

#endif

arch/h8300/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void __init mem_init(void) 
	int codek = 0, datak = 0, initk = 0;

	/* DAVIDM look at setup memory map generically with reserved area */

	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;

	unsigned long len = &_ramend - &_ramstart;

	unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */
@@ -143,7 +143,7 @@ void __init mem_init(void) 
	totalram_pages = free_all_bootmem();



	codek = (&_etext - &_stext) >> 10;

	datak = (&_ebss - &_sdata) >> 10;

	datak = (&__bss_stop - &_sdata) >> 10;

	initk = (&__init_begin - &__init_end) >> 10;



	tmp = nr_free_pages() << PAGE_SHIFT;