From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2008 15:37:01 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb
X-Git-Tag: v2.6.26-rc1~1153
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9732b6112343df2872518ec6701c8ef729310a05;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb:
  kgdb: always use icache flush for sw breakpoints
  kgdb: fix SMP NMI kgdb_handle_exception exit race
  kgdb: documentation fixes
  kgdb: allow static kgdbts boot configuration
  kgdb: add documentation
  kgdb: Kconfig fix
  kgdb: add kgdb internal test suite
  kgdb: fix several kgdb regressions
  kgdb: kgdboc pl011 I/O module
  kgdb: fix optional arch functions and probe_kernel_*
  kgdb: add x86 HW breakpoints
  kgdb: print breakpoint removed on exception
  kgdb: clocksource watchdog
  kgdb: fix NMI hangs
  kgdb: fix kgdboc dynamic module configuration
  kgdb: document parameters
  x86: kgdb support
  consoles: polling support, kgdboc
  kgdb: core
  uaccess: add probe_kernel_write()
---

9732b6112343df2872518ec6701c8ef729310a05
diff --cc arch/x86/kernel/traps_32.c
index bb9107c56ff,c5421f30d67..65791ca2824
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@@ -728,14 -706,14 +728,16 @@@ io_check_error(unsigned char reason, st
  }
  
  static __kprobes void
 -unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
 +unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
  {
+ 	if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)
+ 		return;
  #ifdef CONFIG_MCA
 -	/* Might actually be able to figure out what the guilty party
 -	* is. */
 -	if( MCA_bus ) {
 +	/*
 +	 * Might actually be able to figure out what the guilty party
 +	 * is:
 +	 */
 +	if (MCA_bus) {
  		mca_handle_nmi();
  		return;
  	}