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

Commit 10f204e5 authored by Greg Ungerer's avatar Greg Ungerer Committed by Greg Ungerer
Browse files

m68knommu: rename BSS define in linker script 



The "BSS" define name now used in asm-generic/vmlinux.lds.h
(introduced in commit ef53dae8)
clashes with the internal "BSS" define in the m68knommu vmlinux.lds.S
linker script. So rename it.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent c23b6538

arch/m68knommu/kernel/vmlinux.lds.S

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define	TEXT		ram

#define	DATA		ram

#define	INIT		ram

#define	BSS		ram

#define	BSSS		ram

#endif

#if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL)

#define	RAM_START	CONFIG_RAMBASE
@@ -27,7 +27,7 @@ 
#define	TEXT		rom

#define	DATA		ram

#define	INIT		ram

#define	BSS		ram

#define	BSSS		ram

#endif



#ifndef DATA_ADDR
@@ -192,7 +192,7 @@ SECTIONS { 
		. = ALIGN(4) ;

		_ebss = . ;

	 	_end = . ;

	} > BSS

	} > BSSS



	DISCARDS

}