aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-01 09:26:56 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-08 05:02:25 -0400
commit74b0ec0708e7c8c530079b737f32c55597d062cc (patch)
tree1f293923169632536e44801299c575fb04d331d1 /arch/arm/kernel/vmlinux.lds.S
parent842eab40b6920819fff5caeefdb709f07d3f8e23 (diff)
ARM: vmlinux.lds: Move unwind tables into _stext.._etext
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
-rw-r--r--arch/arm/kernel/vmlinux.lds.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index fd5750b8ac84..065d35de0e01 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -109,8 +109,6 @@ SECTIONS
109 109
110 RO_DATA(PAGE_SIZE) 110 RO_DATA(PAGE_SIZE)
111 111
112 _etext = .; /* End of text and rodata section */
113
114#ifdef CONFIG_ARM_UNWIND 112#ifdef CONFIG_ARM_UNWIND
115 /* 113 /*
116 * Stack unwinding tables 114 * Stack unwinding tables
@@ -128,6 +126,8 @@ SECTIONS
128 } 126 }
129#endif 127#endif
130 128
129 _etext = .; /* End of text and rodata section */
130
131#ifdef CONFIG_XIP_KERNEL 131#ifdef CONFIG_XIP_KERNEL
132 __data_loc = ALIGN(4); /* location in binary */ 132 __data_loc = ALIGN(4); /* location in binary */
133 . = PAGE_OFFSET + TEXT_OFFSET; 133 . = PAGE_OFFSET + TEXT_OFFSET;