diff options
| author | Steven J. Magnani <steve@digidescorp.com> | 2010-04-09 22:03:37 -0500 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2010-05-06 11:21:57 +0200 |
| commit | 7a0248e819ddaf2c2f28e6edd287b90aa930702a (patch) | |
| tree | b117abc994c27606a090e2f71f8b03e6bfe549b5 /arch/microblaze | |
| parent | e6d7961e5be0a259ba87411370f8be7f7da4c0f6 (diff) | |
| download | linux-3.10-7a0248e819ddaf2c2f28e6edd287b90aa930702a.tar.gz linux-3.10-7a0248e819ddaf2c2f28e6edd287b90aa930702a.tar.bz2 linux-3.10-7a0248e819ddaf2c2f28e6edd287b90aa930702a.zip | |
microblaze: Quiet section mismatch warnings
_start is located in .text, which causes mismatch warnings with
machine_early_init() and start_kernel() in .init.text.
Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/head.S | 3 | ||||
| -rw-r--r-- | arch/microblaze/kernel/vmlinux.lds.S | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S index da6a5f5dc76..1bf73988826 100644 --- a/arch/microblaze/kernel/head.S +++ b/arch/microblaze/kernel/head.S @@ -28,6 +28,7 @@ * for more details. */ +#include <linux/init.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/page.h> @@ -49,7 +50,7 @@ swapper_pg_dir: #endif /* CONFIG_MMU */ - .text + __HEAD ENTRY(_start) #if CONFIG_KERNEL_BASE_ADDR == 0 brai TOPHYS(real_start) diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S index 5ef619aad63..db72d712460 100644 --- a/arch/microblaze/kernel/vmlinux.lds.S +++ b/arch/microblaze/kernel/vmlinux.lds.S @@ -24,7 +24,8 @@ SECTIONS { .text : AT(ADDR(.text) - LOAD_OFFSET) { _text = . ; _stext = . ; - *(.text .text.*) + HEAD_TEXT + TEXT_TEXT *(.fixup) EXIT_TEXT EXIT_CALL |