pass proper trap numbers to die chain handlers
PATCH 1/1 pass proper trap numbers to die chain handlers
From: Jan Beulich <[email protected]>
Pass the trap number causing the call to notify_die() to the die notification handler chain in a number of instances. Also, honor the return value from the handler chain invocation in die() as, through a debugger, the fault may have been fixed.
Signed-off-by Jan Beulich <[email protected]>
From: Jan Beulich <[email protected]>
Pass the trap number causing the call to notify_die() to the die notification handler chain in a number of instances. Also, honor the return value from the handler chain invocation in die() as, through a debugger, the fault may have been fixed.
Signed-off-by Jan Beulich <[email protected]>
arch/i386/kernel/traps.c renamed from home/jbeulich/tmp/linux-2.6.16-rc1/arch/i386/kernel/traps.c +10 -5
@@ -362,8 +362,10 @@ void die(const char * str, struct pt_reg#endif if (nl)printk ("\n" ); -notify_die (DIE_OOPS , (char *)str, regs, err,255 ,SIGSEGV ); -show_registers (regs); +if (notify_die (DIE_OOPS , str, regs, err, current->thread.trap_no,SIGSEGV ) !=NOTIFY_STOP ) +show_registers (regs); +else + regs =NULL ; }else printk (KERN_EMERG "Recursive die() failure, output suppressed\n" );
@@ -371,6 +373,9 @@ void die(const char * str, struct pt_reg die.lock_owner =-1 ;spin_unlock_irqrestore (&die.lock, flags); +if (!regs) +return ; +if (kexec_should_crash (current))crash_kexec (regs);
@@ -598,7 +603,7 @@ static DEFINE_SPINLOCK(nmi_print_lock);void die_nmi (struct pt_regs *regs,const char *msg) { -if (notify_die (DIE_NMIWATCHDOG , msg, regs,0 ,0 ,SIGINT ) == +if (notify_die (DIE_NMIWATCHDOG , msg, regs,0 ,2 ,SIGINT ) ==NOTIFY_STOP )return ;
@@ -637,7 +642,7 @@ static void default_do_nmi(struct pt_reg reason =get_nmi_reason ();if (!(reason &0xc0 )) { -if (notify_die (DIE_NMI_IPI ,"nmi_ipi" , regs, reason,0 ,SIGINT ) +if (notify_die (DIE_NMI_IPI ,"nmi_ipi" , regs, reason,2 ,SIGINT ) ==NOTIFY_STOP )return ;#ifdef CONFIG_X86_LOCAL_APIC
@@ -653,7 +658,7 @@ static void default_do_nmi(struct pt_regunknown_nmi_error (reason, regs);return ; } -if (notify_die (DIE_NMI ,"nmi" , regs, reason,0 ,SIGINT ) ==NOTIFY_STOP ) +if (notify_die (DIE_NMI ,"nmi" , regs, reason,2 ,SIGINT ) ==NOTIFY_STOP )return ;if (reason &0x80 )mem_parity_error (reason, regs);