diff options
author | Helge Deller <deller@gmx.de> | 2007-12-26 12:07:01 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@shortfin.cabal.ca> | 2008-03-15 22:12:22 -0400 |
commit | 0c634cc6299b55279fa2d3a7a5964ae45a642498 (patch) | |
tree | c7cac13016c0dff9ae64743f5360d91f518d00fc | |
parent | ab86adb41f5afd75555aad907488f8f26138c549 (diff) |
[PARISC] head.S: section mismatch fixes
- move boot_args[] into the init section
- move $global$ into the read_mostly section
- fix the following two section mismatches:
WARNING: vmlinux.o(.text+0x9c): Section mismatch: reference to .init.text:start_kernel (between '$pgt_fill_loop' and '$is_pa20')
WARNING: vmlinux.o(.text+0xa0): Section mismatch: reference to .init.text:start_kernel (between '$pgt_fill_loop' and '$is_pa20')
Signed-off-by: Helge Deller <deller@gmx.de>
SIgned-off-by: Kyle McMartin <kyle@mcmartin.ca>
-rw-r--r-- | arch/parisc/kernel/head.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index a7b8859488bb..ec2482dc1beb 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
@@ -20,10 +20,11 @@ | |||
20 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
21 | 21 | ||
22 | #include <linux/linkage.h> | 22 | #include <linux/linkage.h> |
23 | #include <linux/init.h> | ||
23 | 24 | ||
24 | .level LEVEL | 25 | .level LEVEL |
25 | 26 | ||
26 | .data | 27 | __INITDATA |
27 | ENTRY(boot_args) | 28 | ENTRY(boot_args) |
28 | .word 0 /* arg0 */ | 29 | .word 0 /* arg0 */ |
29 | .word 0 /* arg1 */ | 30 | .word 0 /* arg1 */ |
@@ -31,7 +32,7 @@ ENTRY(boot_args) | |||
31 | .word 0 /* arg3 */ | 32 | .word 0 /* arg3 */ |
32 | END(boot_args) | 33 | END(boot_args) |
33 | 34 | ||
34 | .text | 35 | .section .text.head |
35 | .align 4 | 36 | .align 4 |
36 | .import init_thread_union,data | 37 | .import init_thread_union,data |
37 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ | 38 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ |
@@ -343,7 +344,7 @@ smp_slave_stext: | |||
343 | ENDPROC(stext) | 344 | ENDPROC(stext) |
344 | 345 | ||
345 | #ifndef CONFIG_64BIT | 346 | #ifndef CONFIG_64BIT |
346 | .data | 347 | .section .data.read_mostly |
347 | 348 | ||
348 | .align 4 | 349 | .align 4 |
349 | .export $global$,data | 350 | .export $global$,data |