.. | .. |
---|
8 | 8 | #include "vmlinux-xip.lds.S" |
---|
9 | 9 | #else |
---|
10 | 10 | |
---|
11 | | -#include <asm-generic/vmlinux.lds.h> |
---|
| 11 | +#include <linux/pgtable.h> |
---|
| 12 | +#include <asm/vmlinux.lds.h> |
---|
12 | 13 | #include <asm/cache.h> |
---|
13 | 14 | #include <asm/thread_info.h> |
---|
14 | 15 | #include <asm/memory.h> |
---|
15 | 16 | #include <asm/mpu.h> |
---|
16 | 17 | #include <asm/page.h> |
---|
17 | | -#include <asm/pgtable.h> |
---|
18 | | - |
---|
19 | | -#include "vmlinux.lds.h" |
---|
20 | 18 | |
---|
21 | 19 | OUTPUT_ARCH(arm) |
---|
22 | 20 | ENTRY(stext) |
---|
.. | .. |
---|
42 | 40 | ARM_DISCARD |
---|
43 | 41 | #ifndef CONFIG_SMP_ON_UP |
---|
44 | 42 | *(.alt.smp.init) |
---|
| 43 | +#endif |
---|
| 44 | +#ifndef CONFIG_ARM_UNWIND |
---|
| 45 | + *(.ARM.exidx) *(.ARM.exidx.*) |
---|
| 46 | + *(.ARM.extab) *(.ARM.extab.*) |
---|
45 | 47 | #endif |
---|
46 | 48 | } |
---|
47 | 49 | |
---|
.. | .. |
---|
80 | 82 | #ifdef CONFIG_ARM_UNWIND |
---|
81 | 83 | ARM_UNWIND_SECTIONS |
---|
82 | 84 | #endif |
---|
83 | | - |
---|
84 | | - NOTES |
---|
85 | 85 | |
---|
86 | 86 | #ifdef CONFIG_STRICT_KERNEL_RWX |
---|
87 | 87 | . = ALIGN(1<<SECTION_SHIFT); |
---|
.. | .. |
---|
143 | 143 | __init_end = .; |
---|
144 | 144 | |
---|
145 | 145 | _sdata = .; |
---|
146 | | - RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) |
---|
| 146 | + RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) |
---|
147 | 147 | _edata = .; |
---|
148 | 148 | |
---|
149 | 149 | BSS_SECTION(0, 0, 0) |
---|
.. | .. |
---|
153 | 153 | _end = .; |
---|
154 | 154 | |
---|
155 | 155 | STABS_DEBUG |
---|
| 156 | + DWARF_DEBUG |
---|
| 157 | + ARM_DETAILS |
---|
| 158 | + |
---|
| 159 | + ARM_ASSERTS |
---|
156 | 160 | } |
---|
157 | 161 | |
---|
158 | 162 | #ifdef CONFIG_STRICT_KERNEL_RWX |
---|
.. | .. |
---|
171 | 175 | */ |
---|
172 | 176 | ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support") |
---|
173 | 177 | ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") |
---|
174 | | - |
---|
175 | | -/* |
---|
176 | | - * The HYP init code can't be more than a page long, |
---|
177 | | - * and should not cross a page boundary. |
---|
178 | | - * The above comment applies as well. |
---|
179 | | - */ |
---|
180 | | -ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE, |
---|
181 | | - "HYP init code too big or misaligned") |
---|
182 | 178 | |
---|
183 | 179 | #endif /* CONFIG_XIP_KERNEL */ |
---|