patch-2.4.22 linux-2.4.22/arch/x86_64/mm/fault.c
Next file: linux-2.4.22/arch/x86_64/mm/init.c
Previous file: linux-2.4.22/arch/x86_64/kernel/warmreboot.S
Back to the patch index
Back to the overall index
- Lines: 55
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/x86_64/mm/fault.c
- Orig date:
2003-06-13 07:51:32.000000000 -0700
diff -urN linux-2.4.21/arch/x86_64/mm/fault.c linux-2.4.22/arch/x86_64/mm/fault.c
@@ -229,9 +229,12 @@
/* User mode accesses just cause a SIGSEGV */
if (error_code & 4) {
- if (exception_trace)
- printk("%s[%d]: segfault at %016lx rip %016lx rsp %016lx error %lx\n",
- current->comm, current->pid, address, regs->rip,
+ if (exception_trace && !(tsk->ptrace & PT_PTRACED) &&
+ (tsk->sig->action[SIGSEGV-1].sa.sa_handler == SIG_IGN ||
+ (tsk->sig->action[SIGSEGV-1].sa.sa_handler == SIG_DFL)))
+ printk(KERN_INFO
+ "%s[%d]: segfault at %016lx rip %016lx rsp %016lx error %lx\n",
+ tsk->comm, tsk->pid, address, regs->rip,
regs->rsp, error_code);
tsk->thread.cr2 = address;
@@ -253,7 +256,7 @@
if (0 && exception_trace)
printk(KERN_ERR
"%s: fixed kernel exception at %lx address %lx err:%ld\n",
- current->comm, regs->rip, address, error_code);
+ tsk->comm, regs->rip, address, error_code);
return;
}
@@ -265,6 +268,21 @@
console_verbose();
bust_spinlocks(1);
+ int cpu = safe_smp_processor_id();
+ unsigned long flags;
+ extern int die_owner;
+ extern spinlock_t die_lock;
+
+ __save_flags(flags);
+ __cli();
+ if (!spin_trylock(&die_lock)) {
+ if (cpu == die_owner)
+ /* nested oops. should stop eventually */;
+ else
+ spin_lock(&die_lock);
+ }
+ die_owner = cpu;
+
if (address < PAGE_SIZE)
printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
else
@@ -275,6 +293,7 @@
dump_pagetable(address);
die("Oops", regs, error_code);
bust_spinlocks(0);
+ spin_unlock_irqrestore(&die_lock, flags);
do_exit(SIGKILL);
/*
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)