diff options
Diffstat (limited to 'arch/x86_64/mm/fault.c')
-rw-r--r-- | arch/x86_64/mm/fault.c | 12 |
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: | |||
458 | up_read(&mm->mmap_sem); | 458 | up_read(&mm->mmap_sem); |
459 | 459 | ||
460 | bad_area_nosemaphore: | 460 | bad_area_nosemaphore: |
461 | |||
462 | #ifdef CONFIG_IA32_EMULATION | ||
463 | /* 32bit vsyscall. map on demand. */ | ||
464 | if (test_thread_flag(TIF_IA32) && | ||
465 | address >= VSYSCALL32_BASE && address < VSYSCALL32_END) { | ||
466 | if (map_syscall32(mm, address) < 0) | ||
467 | goto out_of_memory2; | ||
468 | return; | ||
469 | } | ||
470 | #endif | ||
471 | |||
472 | /* User mode accesses just cause a SIGSEGV */ | 461 | /* User mode accesses just cause a SIGSEGV */ |
473 | if (error_code & 4) { | 462 | if (error_code & 4) { |
474 | if (is_prefetch(regs, address, error_code)) | 463 | if (is_prefetch(regs, address, error_code)) |
@@ -550,7 +539,6 @@ no_context: | |||
550 | */ | 539 | */ |
551 | out_of_memory: | 540 | out_of_memory: |
552 | up_read(&mm->mmap_sem); | 541 | up_read(&mm->mmap_sem); |
553 | out_of_memory2: | ||
554 | if (current->pid == 1) { | 542 | if (current->pid == 1) { |
555 | yield(); | 543 | yield(); |
556 | goto again; | 544 | goto again; |