diff options
-rw-r--r-- | arch/sh/kernel/head_32.S | 3 | ||||
-rw-r--r-- | arch/sh/kernel/head_64.S | 5 | ||||
-rw-r--r-- | arch/sh/kernel/vmlinux_32.lds.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/vmlinux_64.lds.S | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S index 788605ff7088..a78be74b8d3e 100644 --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S | |||
@@ -10,6 +10,7 @@ | |||
10 | * | 10 | * |
11 | * Head.S contains the SH exception handlers and startup code. | 11 | * Head.S contains the SH exception handlers and startup code. |
12 | */ | 12 | */ |
13 | #include <linux/init.h> | ||
13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
14 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
15 | 16 | ||
@@ -40,7 +41,7 @@ ENTRY(empty_zero_page) | |||
40 | 1: | 41 | 1: |
41 | .skip PAGE_SIZE - empty_zero_page - 1b | 42 | .skip PAGE_SIZE - empty_zero_page - 1b |
42 | 43 | ||
43 | .section .text.head, "ax" | 44 | __HEAD |
44 | 45 | ||
45 | /* | 46 | /* |
46 | * Condition at the entry of _stext: | 47 | * Condition at the entry of _stext: |
diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S index 7ccfb995a398..3ea765844c74 100644 --- a/arch/sh/kernel/head_64.S +++ b/arch/sh/kernel/head_64.S | |||
@@ -8,6 +8,9 @@ | |||
8 | * License. See the file "COPYING" in the main directory of this archive | 8 | * License. See the file "COPYING" in the main directory of this archive |
9 | * for more details. | 9 | * for more details. |
10 | */ | 10 | */ |
11 | |||
12 | #include <linux/init.h> | ||
13 | |||
11 | #include <asm/page.h> | 14 | #include <asm/page.h> |
12 | #include <asm/cache.h> | 15 | #include <asm/cache.h> |
13 | #include <asm/tlb.h> | 16 | #include <asm/tlb.h> |
@@ -110,7 +113,7 @@ empty_bad_pte_table: | |||
110 | fpu_in_use: .quad 0 | 113 | fpu_in_use: .quad 0 |
111 | 114 | ||
112 | 115 | ||
113 | .section .text.head, "ax" | 116 | __HEAD |
114 | .balign L1_CACHE_BYTES | 117 | .balign L1_CACHE_BYTES |
115 | /* | 118 | /* |
116 | * Condition at the entry of __stext: | 119 | * Condition at the entry of __stext: |
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S index d0b2a715cd14..dd9b2ee1312d 100644 --- a/arch/sh/kernel/vmlinux_32.lds.S +++ b/arch/sh/kernel/vmlinux_32.lds.S | |||
@@ -31,7 +31,7 @@ SECTIONS | |||
31 | } = 0 | 31 | } = 0 |
32 | 32 | ||
33 | .text : { | 33 | .text : { |
34 | *(.text.head) | 34 | HEAD_TEXT |
35 | TEXT_TEXT | 35 | TEXT_TEXT |
36 | SCHED_TEXT | 36 | SCHED_TEXT |
37 | LOCK_TEXT | 37 | LOCK_TEXT |
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S index 33fa46451406..69664460c688 100644 --- a/arch/sh/kernel/vmlinux_64.lds.S +++ b/arch/sh/kernel/vmlinux_64.lds.S | |||
@@ -42,7 +42,7 @@ SECTIONS | |||
42 | } = 0 | 42 | } = 0 |
43 | 43 | ||
44 | .text : C_PHYS(.text) { | 44 | .text : C_PHYS(.text) { |
45 | *(.text.head) | 45 | HEAD_TEXT |
46 | TEXT_TEXT | 46 | TEXT_TEXT |
47 | *(.text64) | 47 | *(.text64) |
48 | *(.text..SHmedia32) | 48 | *(.text..SHmedia32) |