summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorNelson Elhage <nelhage@ksplice.com>2009-07-31 16:57:52 -0400
committerTony Luck <tony.luck@intel.com>2009-09-15 09:40:27 -0700
commited7af3e63bd2458d5138c4b7e92fe4e1cdc97d9d (patch)
tree634908b68c9b50b7a33cbd88bec01519e75809b7 /arch/ia64
parentf172468a142c6989144ccb827c1b57c69229e8ba (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>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/head.S2
-rw-r--r--arch/ia64/kernel/vmlinux.lds.S4
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: \
mov _tmp2=((ia64_rid(IA64_REGION_ID_KERNEL, (num<<61)) << 8) | (pgsize << 2) | vhpt);; \
mov rr[_tmp1]=_tmp2
- .section __special_page_section,"ax"
+ __PAGE_ALIGNED_DATA
.global empty_zero_page
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
{ *(.data.init_task) }
.data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET)
- { *(__special_page_section)
+ {
+ PAGE_ALIGNED_DATA(PAGE_SIZE)
+ . = ALIGN(PAGE_SIZE);
__start_gate_section = .;
*(.data.gate)
__stop_gate_section = .;