diff options
author | Tim Abbott <tabbott@MIT.EDU> | 2009-04-25 22:10:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 12:20:38 -0400 |
commit | b6a8d95c95814079ded93c14c4b394015d8b65cd (patch) | |
tree | d7f1b8ea9df0827047c0a56ed940066cbd0e3259 | |
parent | 92ca52343ca503c1f957bd649df4ef914d5fc1e8 (diff) |
frv: convert frv to use __HEAD and HEAD_TEXT macros.
This has the consequence of changing the section name use for head
code from ".text.head" to ".head.text". Since this commit changes all
users in the architecture, this change should be harmless.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: David Howells <dhowells@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/frv/kernel/head.S | 3 | ||||
-rw-r--r-- | arch/frv/kernel/vmlinux.lds.S | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S index fecf751c5cae..b825ef3f2d54 100644 --- a/arch/frv/kernel/head.S +++ b/arch/frv/kernel/head.S | |||
@@ -9,6 +9,7 @@ | |||
9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/init.h> | ||
12 | #include <linux/threads.h> | 13 | #include <linux/threads.h> |
13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
14 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
@@ -27,7 +28,7 @@ | |||
27 | # command line string | 28 | # command line string |
28 | # | 29 | # |
29 | ############################################################################### | 30 | ############################################################################### |
30 | .section .text.head,"ax" | 31 | __HEAD |
31 | .balign 4 | 32 | .balign 4 |
32 | 33 | ||
33 | .globl _boot, __head_reference | 34 | .globl _boot, __head_reference |
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S index b95c4eace62f..22d9787406ed 100644 --- a/arch/frv/kernel/vmlinux.lds.S +++ b/arch/frv/kernel/vmlinux.lds.S | |||
@@ -26,7 +26,7 @@ SECTIONS | |||
26 | 26 | ||
27 | _sinittext = .; | 27 | _sinittext = .; |
28 | .init.text : { | 28 | .init.text : { |
29 | *(.text.head) | 29 | HEAD_TEXT |
30 | #ifndef CONFIG_DEBUG_INFO | 30 | #ifndef CONFIG_DEBUG_INFO |
31 | INIT_TEXT | 31 | INIT_TEXT |
32 | EXIT_TEXT | 32 | EXIT_TEXT |