diff options
author | Greg Ungerer <gerg@uclinux.org> | 2009-10-30 00:58:58 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@goober.(none)> | 2009-12-03 20:45:31 -0500 |
commit | 10f204e5ad4e0c72aa007c00cb76c1d5a577032d (patch) | |
tree | 378d6f4389710a222429cf88ffdeb9fafeb86eaf | |
parent | c23b6538d08c8da5e401b8d7c912b322e8ec9c26 (diff) |
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>
-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 @@ | |||
15 | #define TEXT ram | 15 | #define TEXT ram |
16 | #define DATA ram | 16 | #define DATA ram |
17 | #define INIT ram | 17 | #define INIT ram |
18 | #define BSS ram | 18 | #define BSSS ram |
19 | #endif | 19 | #endif |
20 | #if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL) | 20 | #if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL) |
21 | #define RAM_START CONFIG_RAMBASE | 21 | #define RAM_START CONFIG_RAMBASE |
@@ -27,7 +27,7 @@ | |||
27 | #define TEXT rom | 27 | #define TEXT rom |
28 | #define DATA ram | 28 | #define DATA ram |
29 | #define INIT ram | 29 | #define INIT ram |
30 | #define BSS ram | 30 | #define BSSS ram |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #ifndef DATA_ADDR | 33 | #ifndef DATA_ADDR |
@@ -192,7 +192,7 @@ SECTIONS { | |||
192 | . = ALIGN(4) ; | 192 | . = ALIGN(4) ; |
193 | _ebss = . ; | 193 | _ebss = . ; |
194 | _end = . ; | 194 | _end = . ; |
195 | } > BSS | 195 | } > BSSS |
196 | 196 | ||
197 | DISCARDS | 197 | DISCARDS |
198 | } | 198 | } |