This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / x86_64 / mm / fault.c

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index fa083d9..4e12a56 100644 (file)
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -23,7 +23,6 @@
 #include <linux/vt_kern.h>             /* For unblank_screen() */
 #include <linux/compiler.h>
 #include <linux/module.h>
-#include <linux/kprobes.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -33,7 +32,6 @@
 #include <asm/proto.h>
 #include <asm/kdebug.h>
 #include <asm-generic/sections.h>
-#include <asm/kdebug.h>
 
 void bust_spinlocks(int yes)
 {
@@ -270,9 +268,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code)
 
        /* get the address */
        __asm__("movq %%cr2,%0":"=r" (address));
-       if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
-                                       SIGSEGV) == NOTIFY_STOP)
-               return;
 
        if (likely(regs->eflags & X86_EFLAGS_IF))
                local_irq_enable();
@@ -411,7 +406,7 @@ bad_area_nosemaphore:
 #ifdef CONFIG_IA32_EMULATION
        /* 32bit vsyscall. map on demand. */
        if (test_thread_flag(TIF_IA32) &&
-           address >= VSYSCALL32_BASE && address < VSYSCALL32_END) {
+           address >= 0xffffe000 && address < 0xffffe000 + PAGE_SIZE) { 
                if (map_syscall32(mm, address) < 0)
                        goto out_of_memory2;
                return;
@@ -489,7 +484,6 @@ no_context:
        __die("Oops", regs, error_code);
        /* Executive summary in case the body of the oops scrolled away */
        printk(KERN_EMERG "CR2: %016lx\n", address);
-       try_crashdump(regs);
        oops_end(); 
        do_exit(SIGKILL);