diff options
author | Tim Abbott <tabbott@MIT.EDU> | 2009-04-25 22:11:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-26 12:20:38 -0400 |
commit | 6f335cab0431d5df4995bcd4fd952d4c746d5a86 (patch) | |
tree | fa4bd2c2a79d54b53995c6586cd4c67fb18afbef /arch | |
parent | 34963696629b6d1e0066a5f2e67993e409c9434b (diff) |
m68k: 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: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/kernel/head.S | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/sun3-head.S | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux-sun3.lds | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index f513f530de91..86edb5fbcfc3 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S | |||
@@ -577,7 +577,7 @@ func_define putn,1 | |||
577 | #endif | 577 | #endif |
578 | .endm | 578 | .endm |
579 | 579 | ||
580 | .section ".text.head","ax" | 580 | __HEAD |
581 | ENTRY(_stext) | 581 | ENTRY(_stext) |
582 | /* | 582 | /* |
583 | * Version numbers of the bootinfo interface | 583 | * Version numbers of the bootinfo interface |
diff --git a/arch/m68k/kernel/sun3-head.S b/arch/m68k/kernel/sun3-head.S index aad01592dbbc..9e5c3e57c598 100644 --- a/arch/m68k/kernel/sun3-head.S +++ b/arch/m68k/kernel/sun3-head.S | |||
@@ -29,7 +29,7 @@ kernel_pmd_table: .skip 0x2000 | |||
29 | .globl kernel_pg_dir | 29 | .globl kernel_pg_dir |
30 | .equ kernel_pg_dir,kernel_pmd_table | 30 | .equ kernel_pg_dir,kernel_pmd_table |
31 | 31 | ||
32 | .section .text.head | 32 | __HEAD |
33 | ENTRY(_stext) | 33 | ENTRY(_stext) |
34 | ENTRY(_start) | 34 | ENTRY(_start) |
35 | 35 | ||
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index f846d4e3e5e1..01d212bb05a6 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds | |||
@@ -12,7 +12,7 @@ SECTIONS | |||
12 | . = 0x1000; | 12 | . = 0x1000; |
13 | _text = .; /* Text and read-only data */ | 13 | _text = .; /* Text and read-only data */ |
14 | .text : { | 14 | .text : { |
15 | *(.text.head) | 15 | HEAD_TEXT |
16 | TEXT_TEXT | 16 | TEXT_TEXT |
17 | SCHED_TEXT | 17 | SCHED_TEXT |
18 | LOCK_TEXT | 18 | LOCK_TEXT |
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index d9368c0709ba..c192f773db96 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds | |||
@@ -12,7 +12,7 @@ SECTIONS | |||
12 | . = 0xE002000; | 12 | . = 0xE002000; |
13 | _text = .; /* Text and read-only data */ | 13 | _text = .; /* Text and read-only data */ |
14 | .text : { | 14 | .text : { |
15 | *(.text.head) | 15 | HEAD_TEXT |
16 | TEXT_TEXT | 16 | TEXT_TEXT |
17 | SCHED_TEXT | 17 | SCHED_TEXT |
18 | LOCK_TEXT | 18 | LOCK_TEXT |