diff options
author | Nelson Elhage <nelhage@ksplice.com> | 2009-07-31 16:57:52 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2009-09-15 12:40:27 -0400 |
commit | ed7af3e63bd2458d5138c4b7e92fe4e1cdc97d9d (patch) | |
tree | 634908b68c9b50b7a33cbd88bec01519e75809b7 | |
parent | f172468a142c6989144ccb827c1b57c69229e8ba (diff) |
[IA64] Use standard macros for page-aligned data.
Signed-off-by: Nelson Elhage <nelhage@ksplice.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | arch/ia64/kernel/head.S | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index 12305d3d4838..1a6e44515eb4 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S | |||
@@ -167,7 +167,7 @@ RestRR: \ | |||
167 | mov _tmp2=((ia64_rid(IA64_REGION_ID_KERNEL, (num<<61)) << 8) | (pgsize << 2) | vhpt);; \ | 167 | mov _tmp2=((ia64_rid(IA64_REGION_ID_KERNEL, (num<<61)) << 8) | (pgsize << 2) | vhpt);; \ |
168 | mov rr[_tmp1]=_tmp2 | 168 | mov rr[_tmp1]=_tmp2 |
169 | 169 | ||
170 | .section __special_page_section,"ax" | 170 | __PAGE_ALIGNED_DATA |
171 | 171 | ||
172 | .global empty_zero_page | 172 | .global empty_zero_page |
173 | empty_zero_page: | 173 | empty_zero_page: |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index fa3a558e3d76..b484b86da830 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -219,7 +219,9 @@ SECTIONS | |||
219 | { *(.data.init_task) } | 219 | { *(.data.init_task) } |
220 | 220 | ||
221 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) | 221 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) |
222 | { *(__special_page_section) | 222 | { |
223 | PAGE_ALIGNED_DATA(PAGE_SIZE) | ||
224 | . = ALIGN(PAGE_SIZE); | ||
223 | __start_gate_section = .; | 225 | __start_gate_section = .; |
224 | *(.data.gate) | 226 | *(.data.gate) |
225 | __stop_gate_section = .; | 227 | __stop_gate_section = .; |