diff options
author | Tim Abbott <tabbott@MIT.EDU> | 2009-04-25 22:11:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 12:20:38 -0400 |
commit | 9760f8fc60766f8fde0ef5cf7df714c2ce864ab6 (patch) | |
tree | 7b1177a47336fd2f68f9331ee47f4444c585dded | |
parent | 6f335cab0431d5df4995bcd4fd952d4c746d5a86 (diff) |
mn10300: 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: 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/mn10300/kernel/head.S | 3 | ||||
-rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/mn10300/kernel/head.S b/arch/mn10300/kernel/head.S index 8a8309fbe3c4..14f27f3bfaf4 100644 --- a/arch/mn10300/kernel/head.S +++ b/arch/mn10300/kernel/head.S | |||
@@ -9,6 +9,7 @@ | |||
9 | * 2 of the Licence, or (at your option) any later version. | 9 | * 2 of the Licence, 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 <linux/serial_reg.h> | 15 | #include <linux/serial_reg.h> |
@@ -19,7 +20,7 @@ | |||
19 | #include <asm/param.h> | 20 | #include <asm/param.h> |
20 | #include <unit/serial.h> | 21 | #include <unit/serial.h> |
21 | 22 | ||
22 | .section .text.head,"ax" | 23 | __HEAD |
23 | 24 | ||
24 | ############################################################################### | 25 | ############################################################################### |
25 | # | 26 | # |
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index b8259668f7dc..24de6b90f401 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
@@ -27,10 +27,7 @@ SECTIONS | |||
27 | _stext = .; | 27 | _stext = .; |
28 | _text = .; /* Text and read-only data */ | 28 | _text = .; /* Text and read-only data */ |
29 | .text : { | 29 | .text : { |
30 | *( | 30 | HEAD_TEXT |
31 | .text.head | ||
32 | .text | ||
33 | ) | ||
34 | TEXT_TEXT | 31 | TEXT_TEXT |
35 | SCHED_TEXT | 32 | SCHED_TEXT |
36 | LOCK_TEXT | 33 | LOCK_TEXT |