[PATCH] x86_64: Use a VMA for the 32bit vsyscall

Use a real VMA to map the 32bit vsyscall page

This interacts better with Hugh's upcomming VMA walk optimization
Also removes some ugly special cases.

Code roughly modelled after the ppc64 vdso version from Ben Herrenschmidt.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 0 insertions, 12 deletions

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 5724370475cc..d4676ca09144 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -458,17 +458,6 @@ bad_area:
         up_read(&mm->mmap_sem);
 
 bad_area_nosemaphore:
-
-#ifdef CONFIG_IA32_EMULATION
-        /* 32bit vsyscall. map on demand. */
-        if (test_thread_flag(TIF_IA32) &&
-            address >= VSYSCALL32_BASE && address < VSYSCALL32_END) {
-                if (map_syscall32(mm, address) < 0)
-                        goto out_of_memory2;
-                return;
-        }
-#endif
-
         /* User mode accesses just cause a SIGSEGV */
         if (error_code & 4) {
                 if (is_prefetch(regs, address, error_code))
@@ -550,7 +539,6 @@ no_context:
  */
 out_of_memory:
         up_read(&mm->mmap_sem);
-out_of_memory2:
         if (current->pid == 1) { 
                 yield();
                 goto again;