2010-04-10 03:03:51

by Steven J. Magnani

Subject: [PATCH] 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 <[email protected]>
---
diff -uprN a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S
--- a/arch/microblaze/kernel/head.S 2010-04-09 21:52:36.000000000 -0500
+++ b/arch/microblaze/kernel/head.S 2010-04-09 21:56:26.000000000 -0500
@@ -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 -uprN a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
--- a/arch/microblaze/kernel/vmlinux.lds.S 2010-04-09 21:52:36.000000000 -0500
+++ b/arch/microblaze/kernel/vmlinux.lds.S 2010-04-09 21:54:58.000000000 -0500
@@ -24,7 +24,8 @@ SECTIONS {
.text : AT(ADDR(.text) - LOAD_OFFSET) {
_text = . ;
_stext = . ;
- *(.text .text.*)
+ HEAD_TEXT
+ TEXT_TEXT
*(.fixup)
EXIT_TEXT
EXIT_CALL

2010-04-13 07:26:21

by Michal Simek

Subject: Re: [PATCH] microblaze: Quiet section mismatch warnings

Steven J. Magnani wrote:
> _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 <[email protected]>
> ---

Added to next branch. I also fix mismatch for MMU kernel

Thanks.
Michal

--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian