diff options
| author | Roland McGrath <roland@redhat.com> | 2008-01-30 13:30:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:43 +0100 |
| commit | 0aa97fb22624f18e5925d702ab0364d3838cfd91 (patch) | |
| tree | 176cd49b9a41b6b2832e142ad48410a69d6ae651 /arch/x86/vdso | |
| parent | f288f32dc51042fd3a493b85b226e63f1ad3edcc (diff) | |
| download | blackbird-op-linux-0aa97fb22624f18e5925d702ab0364d3838cfd91.tar.gz blackbird-op-linux-0aa97fb22624f18e5925d702ab0364d3838cfd91.zip | |
x86 vDSO: ia32_sysenter_target
This harmonizes the name for the entry point from the 32-bit sysenter
instruction across 32-bit and 64-bit kernels.
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/vdso')
| -rw-r--r-- | arch/x86/vdso/vdso32-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c index 85c52d23ee40..fb71a93c5dce 100644 --- a/arch/x86/vdso/vdso32-setup.c +++ b/arch/x86/vdso/vdso32-setup.c @@ -54,7 +54,7 @@ static int __init vdso_setup(char *s) __setup("vdso=", vdso_setup); -extern asmlinkage void sysenter_entry(void); +extern asmlinkage void ia32_sysenter_target(void); static __init void reloc_symtab(Elf32_Ehdr *ehdr, unsigned offset, unsigned size) @@ -187,7 +187,7 @@ void enable_sep_cpu(void) tss->x86_tss.esp1 = sizeof(struct tss_struct) + (unsigned long) tss; wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); wrmsr(MSR_IA32_SYSENTER_ESP, tss->x86_tss.esp1, 0); - wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0); + wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) ia32_sysenter_target, 0); put_cpu(); } |
