diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-10-30 14:58:58 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@goober.(none)> | 2009-12-04 11:45:31 +1000 |
| commit | 10f204e5ad4e0c72aa007c00cb76c1d5a577032d (patch) | |
| tree | 378d6f4389710a222429cf88ffdeb9fafeb86eaf /arch/m68knommu/kernel/vmlinux.lds.S | |
| parent | c23b6538d08c8da5e401b8d7c912b322e8ec9c26 (diff) | |
| download | talos-obmc-linux-10f204e5ad4e0c72aa007c00cb76c1d5a577032d.tar.gz talos-obmc-linux-10f204e5ad4e0c72aa007c00cb76c1d5a577032d.zip | |
m68knommu: rename BSS define in linker script
The "BSS" define name now used in asm-generic/vmlinux.lds.h
(introduced in commit ef53dae8658cf0e93d380983824a661067948d87)
clashes with the internal "BSS" define in the m68knommu vmlinux.lds.S
linker script. So rename it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/m68knommu/kernel/vmlinux.lds.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 2736a5e309c0..6e10d25f872d 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S @@ -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 } |
