diff options
| author | Roland McGrath | 2008-01-30 13:30:42 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-01-30 13:30:42 +0100 |
| commit | 6c3652efcafa6a6d795093362cb4290c84994b5c (patch) | |
| tree | 1587379f45a7145a64c3103b40e12b01c46ea559 /arch/x86/xen/setup.c | |
| parent | x86 vDSO: vdso32 build (diff) | |
| download | kernel-qcow2-linux-6c3652efcafa6a6d795093362cb4290c84994b5c.tar.gz kernel-qcow2-linux-6c3652efcafa6a6d795093362cb4290c84994b5c.tar.xz kernel-qcow2-linux-6c3652efcafa6a6d795093362cb4290c84994b5c.zip | |
x86 vDSO: i386 vdso32
This makes the i386 kernel use the new vDSO build in arch/x86/vdso/vdso32/
to replace the old one from arch/x86/kernel/.
Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/xen/setup.c')
| -rw-r--r-- | arch/x86/xen/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index f84e77226646..fd91568090f4 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -10,6 +10,7 @@ #include <linux/pm.h> #include <asm/elf.h> +#include <asm/vdso.h> #include <asm/e820.h> #include <asm/setup.h> #include <asm/xen/hypervisor.h> @@ -61,10 +62,8 @@ static void xen_idle(void) */ static void fiddle_vdso(void) { - extern u32 VDSO_NOTE_MASK; /* See ../kernel/vsyscall-note.S. */ extern char vsyscall_int80_start; - u32 *mask = (u32 *) ((unsigned long) &VDSO_NOTE_MASK - VDSO_PRELINK + - &vsyscall_int80_start); + u32 *mask = VDSO32_SYMBOL(&vsyscall_int80_start, NOTE_MASK); *mask |= 1 << VDSO_NOTE_NONEGSEG_BIT; } |