aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-07-12 16:58:13 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 19:00:59 -0400
commitd312ceda567ab91acd756cde95ac5fbc6b40ed40 (patch)
treeb41893c7091cc0564cf5ec8725c90fb408483eda /arch/x86_64/kernel/vmlinux.lds.S
parent4120db47198d21d8cd3b2cdbbe1ea6118a50bcd4 (diff)
[PATCH] x86_64: section alignment fix
This is the second time this has happened: inserting a new section requires that we adjust the arithmetic which is used to calculate the vsyscall page's offset. Cc: Christoph Lameter <christoph@lameter.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/vmlinux.lds.S')
-rw-r--r--arch/x86_64/kernel/vmlinux.lds.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S
index 61c12758ca70..2a94f9b60b2d 100644
--- a/arch/x86_64/kernel/vmlinux.lds.S
+++ b/arch/x86_64/kernel/vmlinux.lds.S
@@ -62,8 +62,8 @@ SECTIONS
62 } 62 }
63 63
64#define VSYSCALL_ADDR (-10*1024*1024) 64#define VSYSCALL_ADDR (-10*1024*1024)
65#define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.cacheline_aligned) + SIZEOF(.data.cacheline_aligned) + 4095) & ~(4095)) 65#define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.read_mostly) + SIZEOF(.data.read_mostly) + 4095) & ~(4095))
66#define VSYSCALL_VIRT_ADDR ((ADDR(.data.cacheline_aligned) + SIZEOF(.data.cacheline_aligned) + 4095) & ~(4095)) 66#define VSYSCALL_VIRT_ADDR ((ADDR(.data.read_mostly) + SIZEOF(.data.read_mostly) + 4095) & ~(4095))
67 67
68#define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR) 68#define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR)
69#define VLOAD(x) (ADDR(x) - VLOAD_OFFSET) 69#define VLOAD(x) (ADDR(x) - VLOAD_OFFSET)