diff options
| -rw-r--r-- | arch/arm/kernel/head-nommu.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/head.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index e5dfc2895e24..573b803dc6bf 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | * numbers for r1. | 32 | * numbers for r1. |
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | .section ".text.head", "ax" | 35 | __HEAD |
| 36 | ENTRY(stext) | 36 | ENTRY(stext) |
| 37 | setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode | 37 | setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode |
| 38 | @ and irqs disabled | 38 | @ and irqs disabled |
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 38ccbe1d3b2c..eb62bf947212 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -74,7 +74,7 @@ | |||
| 74 | * crap here - that's what the boot loader (or in extreme, well justified | 74 | * crap here - that's what the boot loader (or in extreme, well justified |
| 75 | * circumstances, zImage) is for. | 75 | * circumstances, zImage) is for. |
| 76 | */ | 76 | */ |
| 77 | .section ".text.head", "ax" | 77 | __HEAD |
| 78 | ENTRY(stext) | 78 | ENTRY(stext) |
| 79 | setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode | 79 | setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode |
| 80 | @ and irqs disabled | 80 | @ and irqs disabled |
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index aecf87dfbaec..0902f806cd37 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -24,13 +24,11 @@ SECTIONS | |||
| 24 | #else | 24 | #else |
| 25 | . = PAGE_OFFSET + TEXT_OFFSET; | 25 | . = PAGE_OFFSET + TEXT_OFFSET; |
| 26 | #endif | 26 | #endif |
| 27 | .text.head : { | ||
| 28 | _stext = .; | ||
| 29 | _sinittext = .; | ||
| 30 | *(.text.head) | ||
| 31 | } | ||
| 32 | 27 | ||
| 33 | .init : { /* Init code and data */ | 28 | .init : { /* Init code and data */ |
| 29 | _stext = .; | ||
| 30 | _sinittext = .; | ||
| 31 | HEAD_TEXT | ||
| 34 | INIT_TEXT | 32 | INIT_TEXT |
| 35 | _einittext = .; | 33 | _einittext = .; |
| 36 | __proc_info_begin = .; | 34 | __proc_info_begin = .; |
