diff options
author | Tim Abbott <tabbott@MIT.EDU> | 2009-04-25 22:10:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 12:20:38 -0400 |
commit | 0ebdcb4d0480d1b8219cf5f9eab0fb5d889af0ad (patch) | |
tree | 0208d6eb248077260467eec3bd8746ab0e8bfd2b | |
parent | c80d471a476b6d6fe0bc1fd25293c24c66b7aaaf (diff) |
xtensa: convert to use __HEAD and HEAD_TEXT macros.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Chris Zankel <chris@zankel.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/xtensa/kernel/head.S | 3 | ||||
-rw-r--r-- | arch/xtensa/kernel/vmlinux.lds.S | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S index 0817f9db836e..d9ddc1ba761c 100644 --- a/arch/xtensa/kernel/head.S +++ b/arch/xtensa/kernel/head.S | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/page.h> | 19 | #include <asm/page.h> |
20 | #include <asm/cacheasm.h> | 20 | #include <asm/cacheasm.h> |
21 | 21 | ||
22 | #include <linux/init.h> | ||
22 | #include <linux/linkage.h> | 23 | #include <linux/linkage.h> |
23 | 24 | ||
24 | /* | 25 | /* |
@@ -45,7 +46,7 @@ | |||
45 | * instruction. | 46 | * instruction. |
46 | */ | 47 | */ |
47 | 48 | ||
48 | .section .head.text, "ax" | 49 | __HEAD |
49 | .globl _start | 50 | .globl _start |
50 | _start: _j 2f | 51 | _start: _j 2f |
51 | .align 4 | 52 | .align 4 |
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index c1be9a4a740c..5accf51053da 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S | |||
@@ -85,8 +85,8 @@ SECTIONS | |||
85 | 85 | ||
86 | .text : | 86 | .text : |
87 | { | 87 | { |
88 | /* The .head.text section must be the first section! */ | 88 | /* The HEAD_TEXT section must be the first section! */ |
89 | *(.head.text) | 89 | HEAD_TEXT |
90 | *(.literal .text) | 90 | *(.literal .text) |
91 | VMLINUX_SYMBOL(__sched_text_start) = .; | 91 | VMLINUX_SYMBOL(__sched_text_start) = .; |
92 | *(.sched.literal .sched.text) | 92 | *(.sched.literal .sched.text) |