diff options
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 36ff15bbfdd4..11c1785bf63e 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
@@ -114,6 +114,15 @@ SECTIONS | |||
114 | 114 | ||
115 | RO_DATA(PAGE_SIZE) | 115 | RO_DATA(PAGE_SIZE) |
116 | 116 | ||
117 | . = ALIGN(4); | ||
118 | __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { | ||
119 | __start___ex_table = .; | ||
120 | #ifdef CONFIG_MMU | ||
121 | *(__ex_table) | ||
122 | #endif | ||
123 | __stop___ex_table = .; | ||
124 | } | ||
125 | |||
117 | #ifdef CONFIG_ARM_UNWIND | 126 | #ifdef CONFIG_ARM_UNWIND |
118 | /* | 127 | /* |
119 | * Stack unwinding tables | 128 | * Stack unwinding tables |
@@ -131,6 +140,8 @@ SECTIONS | |||
131 | } | 140 | } |
132 | #endif | 141 | #endif |
133 | 142 | ||
143 | NOTES | ||
144 | |||
134 | _etext = .; /* End of text and rodata section */ | 145 | _etext = .; /* End of text and rodata section */ |
135 | 146 | ||
136 | #ifndef CONFIG_XIP_KERNEL | 147 | #ifndef CONFIG_XIP_KERNEL |
@@ -220,16 +231,6 @@ SECTIONS | |||
220 | READ_MOSTLY_DATA(L1_CACHE_BYTES) | 231 | READ_MOSTLY_DATA(L1_CACHE_BYTES) |
221 | 232 | ||
222 | /* | 233 | /* |
223 | * The exception fixup table (might need resorting at runtime) | ||
224 | */ | ||
225 | . = ALIGN(4); | ||
226 | __start___ex_table = .; | ||
227 | #ifdef CONFIG_MMU | ||
228 | *(__ex_table) | ||
229 | #endif | ||
230 | __stop___ex_table = .; | ||
231 | |||
232 | /* | ||
233 | * and the usual data section | 234 | * and the usual data section |
234 | */ | 235 | */ |
235 | DATA_DATA | 236 | DATA_DATA |
@@ -296,8 +297,6 @@ SECTIONS | |||
296 | } | 297 | } |
297 | #endif | 298 | #endif |
298 | 299 | ||
299 | NOTES | ||
300 | |||
301 | BSS_SECTION(0, 0, 0) | 300 | BSS_SECTION(0, 0, 0) |
302 | _end = .; | 301 | _end = .; |
303 | 302 | ||