Skip to content

Commit

Permalink
m68knommu: rename BSS define in linker script
Browse files Browse the repository at this point in the history
The "BSS" define name now used in asm-generic/vmlinux.lds.h
(introduced in commit ef53dae)
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>
  • Loading branch information
Greg Ungerer authored and Greg Ungerer committed Dec 4, 2009
1 parent c23b653 commit 10f204e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/m68knommu/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +27,7 @@
#define TEXT rom
#define DATA ram
#define INIT ram
#define BSS ram
#define BSSS ram
#endif

#ifndef DATA_ADDR
Expand Down Expand Up @@ -192,7 +192,7 @@ SECTIONS {
. = ALIGN(4) ;
_ebss = . ;
_end = . ;
} > BSS
} > BSSS

DISCARDS
}
Expand Down

0 comments on commit 10f204e

Please sign in to comment.