Commit e6fb2e60 authored by Russell King's avatar Russell King

[ARM] Fix init section naming

2.5.44 changed .text.init to .init.text (and other similar section
names).  This cset fixes the ARM parts to work with the new names.
parent 1c16eda0
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
* adhering to the above criteria. * adhering to the above criteria.
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include "entry-header.S" #include "entry-header.S"
.text .text
...@@ -597,7 +598,7 @@ ENTRY(__switch_to) ...@@ -597,7 +598,7 @@ ENTRY(__switch_to)
* What we need to put into 0-0x1c are branches to branch to the kernel. * What we need to put into 0-0x1c are branches to branch to the kernel.
*/ */
.section ".text.init",#alloc,#execinstr __INIT
.Ljump_addresses: .Ljump_addresses:
swi SYS_ERROR0 swi SYS_ERROR0
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* it to save wrong values... Be aware! * it to save wrong values... Be aware!
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include "entry-header.S" #include "entry-header.S"
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/glue.h> #include <asm/glue.h>
...@@ -1013,7 +1014,7 @@ ENTRY(__switch_to) ...@@ -1013,7 +1014,7 @@ ENTRY(__switch_to)
mcr p15, 0, r2, c3, c0 @ Set domain register mcr p15, 0, r2, c3, c0 @ Set domain register
ldmib r1, {r4 - sl, fp, sp, pc} @ Load all regs saved previously ldmib r1, {r4 - sl, fp, sp, pc} @ Load all regs saved previously
.section ".text.init",#alloc,#execinstr __INIT
/* /*
* Vector stubs. NOTE that we only align 'vector_IRQ' to a cache line boundary, * Vector stubs. NOTE that we only align 'vector_IRQ' to a cache line boundary,
* and we rely on each stub being exactly 48 (1.5 cache lines) in size. This * and we rely on each stub being exactly 48 (1.5 cache lines) in size. This
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
* crap here - that's what the boot loader (or in extreme, well justified * crap here - that's what the boot loader (or in extreme, well justified
* circumstances, zImage) is for. * circumstances, zImage) is for.
*/ */
.section ".text.init",#alloc,#execinstr __INIT
.type stext, #function .type stext, #function
ENTRY(stext) ENTRY(stext)
mov r12, r0 mov r12, r0
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
.globl swapper_pg_dir .globl swapper_pg_dir
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
/* /*
* Entry point. * Entry point.
*/ */
.section ".text.init",#alloc,#execinstr __INIT
ENTRY(stext) ENTRY(stext)
__entry: cmp pc, #0x02000000 __entry: cmp pc, #0x02000000
ldrlt pc, LC0 @ if 0x01800000, call at 0x02080000 ldrlt pc, LC0 @ if 0x01800000, call at 0x02080000
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* ASM optimised string functions * ASM optimised string functions
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
...@@ -57,7 +58,7 @@ ENTRY(v3_clear_user_page) ...@@ -57,7 +58,7 @@ ENTRY(v3_clear_user_page)
bne 1b @ 1 bne 1b @ 1
ldr pc, [sp], #4 ldr pc, [sp], #4
.section ".text.init", #alloc, #execinstr __INIT
ENTRY(v3_user_fns) ENTRY(v3_user_fns)
.long v3_clear_user_page .long v3_clear_user_page
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* ASM optimised string functions * ASM optimised string functions
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/constants.h> #include <asm/constants.h>
.text .text
...@@ -70,7 +71,7 @@ ENTRY(v4_mc_clear_user_page) ...@@ -70,7 +71,7 @@ ENTRY(v4_mc_clear_user_page)
bne 1b @ 1 bne 1b @ 1
ldr pc, [sp], #4 ldr pc, [sp], #4
.section ".text.init", #alloc, #execinstr __INIT
ENTRY(v4_mc_user_fns) ENTRY(v4_mc_user_fns)
.long v4_mc_clear_user_page .long v4_mc_clear_user_page
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* ASM optimised string functions * ASM optimised string functions
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/constants.h> #include <asm/constants.h>
.text .text
...@@ -69,7 +70,7 @@ ENTRY(v4wb_clear_user_page) ...@@ -69,7 +70,7 @@ ENTRY(v4wb_clear_user_page)
mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB
ldr pc, [sp], #4 ldr pc, [sp], #4
.section ".text.init", #alloc, #execinstr __INIT
ENTRY(v4wb_user_fns) ENTRY(v4wb_user_fns)
.long v4wb_clear_user_page .long v4wb_clear_user_page
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* the only supported cache operation. * the only supported cache operation.
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/constants.h> #include <asm/constants.h>
.text .text
...@@ -63,7 +64,7 @@ ENTRY(v4wt_clear_user_page) ...@@ -63,7 +64,7 @@ ENTRY(v4wt_clear_user_page)
mcr p15, 0, r2, c7, c7, 0 @ flush ID cache mcr p15, 0, r2, c7, c7, 0 @ flush ID cache
ldr pc, [sp], #4 ldr pc, [sp], #4
.section ".text.init", #alloc, #execinstr __INIT
ENTRY(v4wt_user_fns) ENTRY(v4wt_user_fns)
.long v4wt_clear_user_page .long v4wt_clear_user_page
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/constants.h> #include <asm/constants.h>
/* /*
...@@ -78,7 +79,7 @@ ENTRY(xscale_mc_clear_user_page) ...@@ -78,7 +79,7 @@ ENTRY(xscale_mc_clear_user_page)
bne 1b bne 1b
ldr pc, [sp], #4 ldr pc, [sp], #4
.section ".text.init", #alloc, #execinstr __INIT
ENTRY(xscale_mc_user_fns) ENTRY(xscale_mc_user_fns)
.long xscale_mc_clear_user_page .long xscale_mc_clear_user_page
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -450,7 +451,7 @@ ENTRY(cpu_arm1020_name) ...@@ -450,7 +451,7 @@ ENTRY(cpu_arm1020_name)
.ascii "\0" .ascii "\0"
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__arm1020_setup: __arm1020_setup:
mov r0, #0 mov r0, #0
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* and memory functions on ARM2, ARM250 and ARM3 processors. * and memory functions on ARM2, ARM250 and ARM3 processors.
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -280,7 +281,7 @@ _arm2_name: .asciz "ARM 2" ...@@ -280,7 +281,7 @@ _arm2_name: .asciz "ARM 2"
_arm250_name: .asciz "ARM 250" _arm250_name: .asciz "ARM 250"
_arm3_name: .asciz "ARM 3" _arm3_name: .asciz "ARM 3"
.section ".text.init", #alloc, #execinstr __INIT
/* /*
* Purpose : Function pointers used to access above functions - all calls * Purpose : Function pointers used to access above functions - all calls
* come through these * come through these
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* functions on the ARM610 & ARM710. * functions on the ARM610 & ARM710.
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -316,7 +317,7 @@ cpu_arm710_name: ...@@ -316,7 +317,7 @@ cpu_arm710_name:
.asciz "ARM 710" .asciz "ARM 710"
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__arm6_setup: mov r0, #0 __arm6_setup: mov r0, #0
mcr p15, 0, r0, c7, c0 @ flush caches on v3 mcr p15, 0, r0, c7, c0 @ flush caches on v3
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
* 08-25-2000 DBS Updated for integration of ARM Ltd version. * 08-25-2000 DBS Updated for integration of ARM Ltd version.
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -177,7 +178,7 @@ cpu_arm720_name: ...@@ -177,7 +178,7 @@ cpu_arm720_name:
.asciz "ARM720T" .asciz "ARM720T"
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__arm720_setup: mov r0, #0 __arm720_setup: mov r0, #0
mcr p15, 0, r0, c7, c7, 0 @ invalidate caches mcr p15, 0, r0, c7, c7, 0 @ invalidate caches
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -443,7 +444,7 @@ ENTRY(cpu_arm920_name) ...@@ -443,7 +444,7 @@ ENTRY(cpu_arm920_name)
.ascii "\0" .ascii "\0"
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__arm920_setup: __arm920_setup:
mov r0, #0 mov r0, #0
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -442,7 +443,7 @@ ENTRY(cpu_arm922_name) ...@@ -442,7 +443,7 @@ ENTRY(cpu_arm922_name)
.ascii "\0" .ascii "\0"
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__arm922_setup: __arm922_setup:
mov r0, #0 mov r0, #0
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -430,7 +431,7 @@ ENTRY(cpu_arm926_name) ...@@ -430,7 +431,7 @@ ENTRY(cpu_arm926_name)
.ascii "\0" .ascii "\0"
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__arm926_setup: __arm926_setup:
mov r0, #0 mov r0, #0
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Flush the read buffer at context switches * Flush the read buffer at context switches
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -484,7 +485,7 @@ cpu_sa1110_name: ...@@ -484,7 +485,7 @@ cpu_sa1110_name:
.asciz "StrongARM-1110" .asciz "StrongARM-1110"
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__sa1100_setup: @ Allow read-buffer operations from userland __sa1100_setup: @ Allow read-buffer operations from userland
mcr p15, 0, r0, c9, c0, 5 mcr p15, 0, r0, c9, c0, 5
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/procinfo.h> #include <asm/procinfo.h>
...@@ -668,7 +669,7 @@ cpu_pxa250_name: ...@@ -668,7 +669,7 @@ cpu_pxa250_name:
.align .align
.section ".text.init", #alloc, #execinstr __INIT
__xscale_setup: __xscale_setup:
mov r0, #PSR_F_BIT|PSR_I_BIT|SVC_MODE mov r0, #PSR_F_BIT|PSR_I_BIT|SVC_MODE
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
* Processors: ARM610, ARM710. * Processors: ARM610, ARM710.
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "proc-macros.S" #include "proc-macros.S"
...@@ -41,7 +42,7 @@ ENTRY(v3_flush_kern_tlb_range) ...@@ -41,7 +42,7 @@ ENTRY(v3_flush_kern_tlb_range)
blo 1b blo 1b
mov pc, lr mov pc, lr
.section ".text.init", #alloc, #execinstr __INIT
.type v3_tlb_fns, #object .type v3_tlb_fns, #object
ENTRY(v3_tlb_fns) ENTRY(v3_tlb_fns)
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* Processors: ARM720T * Processors: ARM720T
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "proc-macros.S" #include "proc-macros.S"
...@@ -55,7 +56,7 @@ ENTRY(v4_flush_user_tlb_range) ...@@ -55,7 +56,7 @@ ENTRY(v4_flush_user_tlb_range)
.globl v4_flush_kern_tlb_range .globl v4_flush_kern_tlb_range
.equ v4_flush_kern_tlb_range, .v4_flush_kern_tlb_range .equ v4_flush_kern_tlb_range, .v4_flush_kern_tlb_range
.section ".text.init", #alloc, #execinstr __INIT
.type v4_tlb_fns, #object .type v4_tlb_fns, #object
ENTRY(v4_tlb_fns) ENTRY(v4_tlb_fns)
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* Processors: ARM920 ARM922 ARM926 SA110 SA1100 SA1110 XScale * Processors: ARM920 ARM922 ARM926 SA110 SA1100 SA1110 XScale
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h>
#include <asm/constants.h> #include <asm/constants.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include "proc-macros.S" #include "proc-macros.S"
...@@ -110,7 +111,7 @@ ENTRY(v4wbi_flush_kern_tlb_range) ...@@ -110,7 +111,7 @@ ENTRY(v4wbi_flush_kern_tlb_range)
blo 1b blo 1b
mov pc, lr mov pc, lr
.section ".text.init", #alloc, #execinstr __INIT
.type v4wb_tlb_fns, #object .type v4wb_tlb_fns, #object
ENTRY(v4wb_tlb_fns) ENTRY(v4wb_tlb_fns)
......
...@@ -11,7 +11,7 @@ SECTIONS ...@@ -11,7 +11,7 @@ SECTIONS
.init : { /* Init code and data */ .init : { /* Init code and data */
_stext = .; _stext = .;
__init_begin = .; __init_begin = .;
*(.text.init) *(.init.text)
__proc_info_begin = .; __proc_info_begin = .;
*(.proc.info) *(.proc.info)
__proc_info_end = .; __proc_info_end = .;
...@@ -21,10 +21,10 @@ SECTIONS ...@@ -21,10 +21,10 @@ SECTIONS
__tagtable_begin = .; __tagtable_begin = .;
*(.taglist) *(.taglist)
__tagtable_end = .; __tagtable_end = .;
*(.data.init) *(.init.data)
. = ALIGN(16); . = ALIGN(16);
__setup_start = .; __setup_start = .;
*(.setup.init) *(.init.setup)
__setup_end = .; __setup_end = .;
__initcall_start = .; __initcall_start = .;
*(.initcall1.init) *(.initcall1.init)
...@@ -44,8 +44,8 @@ SECTIONS ...@@ -44,8 +44,8 @@ SECTIONS
} }
/DISCARD/ : { /* Exit code and data */ /DISCARD/ : { /* Exit code and data */
*(.text.exit) *(.exit.text)
*(.data.exit) *(.exit.data)
*(.exitcall.exit) *(.exitcall.exit)
} }
......
...@@ -11,7 +11,7 @@ SECTIONS ...@@ -11,7 +11,7 @@ SECTIONS
.init : { /* Init code and data */ .init : { /* Init code and data */
_stext = .; _stext = .;
__init_begin = .; __init_begin = .;
*(.text.init) *(.init.text)
__proc_info_begin = .; __proc_info_begin = .;
*(.proc.info) *(.proc.info)
__proc_info_end = .; __proc_info_end = .;
...@@ -21,10 +21,10 @@ SECTIONS ...@@ -21,10 +21,10 @@ SECTIONS
__tagtable_begin = .; __tagtable_begin = .;
*(.taglist) *(.taglist)
__tagtable_end = .; __tagtable_end = .;
*(.data.init) *(.init.data)
. = ALIGN(16); . = ALIGN(16);
__setup_start = .; __setup_start = .;
*(.setup.init) *(.init.setup)
__setup_end = .; __setup_end = .;
__initcall_start = .; __initcall_start = .;
*(.initcall1.init) *(.initcall1.init)
...@@ -40,8 +40,8 @@ SECTIONS ...@@ -40,8 +40,8 @@ SECTIONS
} }
/DISCARD/ : { /* Exit code and data */ /DISCARD/ : { /* Exit code and data */
*(.text.exit) *(.exit.text)
*(.data.exit) *(.exit.data)
*(.exitcall.exit) *(.exitcall.exit)
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment