diff options
author | Tim Abbott <tabbott@MIT.EDU> | 2009-04-25 22:10:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 12:20:38 -0400 |
commit | 92ca52343ca503c1f957bd649df4ef914d5fc1e8 (patch) | |
tree | 7be3eb7914ca79b65fc68a14c9e885b56d462f18 | |
parent | 0ebdcb4d0480d1b8219cf5f9eab0fb5d889af0ad (diff) |
alpha: convert 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: Richard Henderson <rth@twiddle.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/kernel/head.S | 3 | ||||
-rw-r--r-- | arch/alpha/kernel/vmlinux.lds.S | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S index 7ac1f1372c36..4bdd1d2ff353 100644 --- a/arch/alpha/kernel/head.S +++ b/arch/alpha/kernel/head.S | |||
@@ -7,10 +7,11 @@ | |||
7 | * the kernel global pointer and jump to the kernel entry-point. | 7 | * the kernel global pointer and jump to the kernel entry-point. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/init.h> | ||
10 | #include <asm/system.h> | 11 | #include <asm/system.h> |
11 | #include <asm/asm-offsets.h> | 12 | #include <asm/asm-offsets.h> |
12 | 13 | ||
13 | .section .text.head, "ax" | 14 | __HEAD |
14 | .globl swapper_pg_dir | 15 | .globl swapper_pg_dir |
15 | .globl _stext | 16 | .globl _stext |
16 | swapper_pg_dir=SWAPPER_PGD | 17 | swapper_pg_dir=SWAPPER_PGD |
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index ef37fc1acaea..b9d6568e5f7f 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
@@ -16,7 +16,7 @@ SECTIONS | |||
16 | 16 | ||
17 | _text = .; /* Text and read-only data */ | 17 | _text = .; /* Text and read-only data */ |
18 | .text : { | 18 | .text : { |
19 | *(.text.head) | 19 | HEAD_TEXT |
20 | TEXT_TEXT | 20 | TEXT_TEXT |
21 | SCHED_TEXT | 21 | SCHED_TEXT |
22 | LOCK_TEXT | 22 | LOCK_TEXT |