diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:00 -0400 |
| commit | 6d72b7952fa7d7c61d021398970c29afde6a4443 (patch) | |
| tree | 31c00be8e2837e2db2e62c694421a93a9f4c79d7 /arch/ia64/kernel/vmlinux.lds.S | |
| parent | 6360b1fbb4a939efd34fc770c2ebd927c55506e0 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rodata
Diffstat (limited to 'arch/ia64/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 80622acc95de..5929ab10a289 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
| @@ -156,6 +156,13 @@ SECTIONS | |||
| 156 | __end___vtop_patchlist = .; | 156 | __end___vtop_patchlist = .; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | .data.patch.rse : AT(ADDR(.data.patch.rse) - LOAD_OFFSET) | ||
| 160 | { | ||
| 161 | __start___rse_patchlist = .; | ||
| 162 | *(.data.patch.rse) | ||
| 163 | __end___rse_patchlist = .; | ||
| 164 | } | ||
| 165 | |||
| 159 | .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) | 166 | .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) |
| 160 | { | 167 | { |
| 161 | __start___mckinley_e9_bundles = .; | 168 | __start___mckinley_e9_bundles = .; |