aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
-rw-r--r--arch/arm/kernel/vmlinux.lds.S10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index f76e75548670..43a31fb06318 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -4,11 +4,13 @@
4 */ 4 */
5 5
6#include <asm-generic/vmlinux.lds.h> 6#include <asm-generic/vmlinux.lds.h>
7#include <asm/cache.h>
7#include <asm/thread_info.h> 8#include <asm/thread_info.h>
8#include <asm/memory.h> 9#include <asm/memory.h>
9#include <asm/page.h> 10#include <asm/page.h>
10 11
11#define PROC_INFO \ 12#define PROC_INFO \
13 . = ALIGN(4); \
12 VMLINUX_SYMBOL(__proc_info_begin) = .; \ 14 VMLINUX_SYMBOL(__proc_info_begin) = .; \
13 *(.proc.info.init) \ 15 *(.proc.info.init) \
14 VMLINUX_SYMBOL(__proc_info_end) = .; 16 VMLINUX_SYMBOL(__proc_info_end) = .;
@@ -181,7 +183,7 @@ SECTIONS
181 } 183 }
182#endif 184#endif
183 185
184 PERCPU_SECTION(32) 186 PERCPU_SECTION(L1_CACHE_BYTES)
185 187
186#ifdef CONFIG_XIP_KERNEL 188#ifdef CONFIG_XIP_KERNEL
187 __data_loc = ALIGN(4); /* location in binary */ 189 __data_loc = ALIGN(4); /* location in binary */
@@ -212,13 +214,13 @@ SECTIONS
212#endif 214#endif
213 215
214 NOSAVE_DATA 216 NOSAVE_DATA
215 CACHELINE_ALIGNED_DATA(32) 217 CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
216 READ_MOSTLY_DATA(32) 218 READ_MOSTLY_DATA(L1_CACHE_BYTES)
217 219
218 /* 220 /*
219 * The exception fixup table (might need resorting at runtime) 221 * The exception fixup table (might need resorting at runtime)
220 */ 222 */
221 . = ALIGN(32); 223 . = ALIGN(4);
222 __start___ex_table = .; 224 __start___ex_table = .;
223#ifdef CONFIG_MMU 225#ifdef CONFIG_MMU
224 *(__ex_table) 226 *(__ex_table)