aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-07-03 18:03:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:34 -0400
commit5dd7cd11a0dde589e3532cfdc06372a1af9fdba7 (patch)
treec606c75a37164b632844263cacf0469d28855fe6
parent06256f8f719917581a221221bb851fcf88de564b (diff)
h8300: normalize global variables exported by vmlinux.lds
Generate mandatory global variables __bss_start/__bss_stop in file vmlinux.lds. Also remove one unused declaration of _text. Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/h8300/boot/compressed/misc.c1
-rw-r--r--arch/h8300/kernel/vmlinux.lds.S2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/h8300/boot/compressed/misc.c b/arch/h8300/boot/compressed/misc.c
index 51ab6cbd030f..4a1e3dd43948 100644
--- a/arch/h8300/boot/compressed/misc.c
+++ b/arch/h8300/boot/compressed/misc.c
@@ -79,7 +79,6 @@ static void error(char *m);
79 79
80int puts(const char *); 80int puts(const char *);
81 81
82extern int _text; /* Defined in vmlinux.lds.S */
83extern int _end; 82extern int _end;
84static unsigned long free_mem_ptr; 83static unsigned long free_mem_ptr;
85static unsigned long free_mem_end_ptr; 84static unsigned long free_mem_end_ptr;
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 03d356d96e5d..3253fed42ac1 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -132,10 +132,12 @@ SECTIONS
132 { 132 {
133 . = ALIGN(0x4) ; 133 . = ALIGN(0x4) ;
134 __sbss = . ; 134 __sbss = . ;
135 ___bss_start = . ;
135 *(.bss*) 136 *(.bss*)
136 . = ALIGN(0x4) ; 137 . = ALIGN(0x4) ;
137 *(COMMON) 138 *(COMMON)
138 . = ALIGN(0x4) ; 139 . = ALIGN(0x4) ;
140 ___bss_stop = . ;
139 __ebss = . ; 141 __ebss = . ;
140 __end = . ; 142 __end = . ;
141 __ramstart = .; 143 __ramstart = .;