diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-05-31 16:39:21 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-06-27 03:59:43 -0400 |
commit | 363737d66427c18edb321a06933ac999d9ce5d7f (patch) | |
tree | 6004bda0a098ccd8292790c2cfb8e28c635545b8 /arch/microblaze/kernel | |
parent | dfe1d26d4a90287ede6b5376967375e1f8af3434 (diff) |
mtd/uclinux: Use generic __bss_stop instead of _ebss
The standard (see BSS_SECTION() in <asm-generic/vmlinux.lds.h> and
<asm-generic/sections.h>) symbol for the end of BSS is __bss_stop.
This allows to remove all local declarations that have been added to
several architectures just to please CONFIG_MTD_UCLINUX.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r-- | arch/microblaze/kernel/microblaze_ksyms.c | 3 | ||||
-rw-r--r-- | arch/microblaze/kernel/setup.c | 4 | ||||
-rw-r--r-- | arch/microblaze/kernel/vmlinux.lds.S | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/microblaze/kernel/microblaze_ksyms.c b/arch/microblaze/kernel/microblaze_ksyms.c index bb4907c828dc..2b25bcf05c00 100644 --- a/arch/microblaze/kernel/microblaze_ksyms.c +++ b/arch/microblaze/kernel/microblaze_ksyms.c | |||
@@ -21,9 +21,6 @@ | |||
21 | #include <linux/ftrace.h> | 21 | #include <linux/ftrace.h> |
22 | #include <linux/uaccess.h> | 22 | #include <linux/uaccess.h> |
23 | 23 | ||
24 | extern char *_ebss; | ||
25 | EXPORT_SYMBOL_GPL(_ebss); | ||
26 | |||
27 | #ifdef CONFIG_FUNCTION_TRACER | 24 | #ifdef CONFIG_FUNCTION_TRACER |
28 | extern void _mcount(void); | 25 | extern void _mcount(void); |
29 | EXPORT_SYMBOL(_mcount); | 26 | EXPORT_SYMBOL(_mcount); |
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 16d8dfd9094b..4da971d4392f 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c | |||
@@ -121,7 +121,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
121 | 121 | ||
122 | /* Move ROMFS out of BSS before clearing it */ | 122 | /* Move ROMFS out of BSS before clearing it */ |
123 | if (romfs_size > 0) { | 123 | if (romfs_size > 0) { |
124 | memmove(&_ebss, (int *)romfs_base, romfs_size); | 124 | memmove(&__bss_stop, (int *)romfs_base, romfs_size); |
125 | klimit += romfs_size; | 125 | klimit += romfs_size; |
126 | } | 126 | } |
127 | #endif | 127 | #endif |
@@ -165,7 +165,7 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
165 | BUG_ON(romfs_size < 0); /* What else can we do? */ | 165 | BUG_ON(romfs_size < 0); /* What else can we do? */ |
166 | 166 | ||
167 | printk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n", | 167 | printk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n", |
168 | romfs_size, romfs_base, (unsigned)&_ebss); | 168 | romfs_size, romfs_base, (unsigned)&__bss_stop); |
169 | 169 | ||
170 | printk("New klimit: 0x%08x\n", (unsigned)klimit); | 170 | printk("New klimit: 0x%08x\n", (unsigned)klimit); |
171 | #endif | 171 | #endif |
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S index 109e9d86ade4..936d01a689d7 100644 --- a/arch/microblaze/kernel/vmlinux.lds.S +++ b/arch/microblaze/kernel/vmlinux.lds.S | |||
@@ -131,7 +131,6 @@ SECTIONS { | |||
131 | *(COMMON) | 131 | *(COMMON) |
132 | . = ALIGN (4) ; | 132 | . = ALIGN (4) ; |
133 | __bss_stop = . ; | 133 | __bss_stop = . ; |
134 | _ebss = . ; | ||
135 | } | 134 | } |
136 | . = ALIGN(PAGE_SIZE); | 135 | . = ALIGN(PAGE_SIZE); |
137 | _end = .; | 136 | _end = .; |