diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-07-30 04:58:10 -0700 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2012-07-31 08:16:43 -0500 |
| commit | b10d22d6e8f76b9e94871aebe0fc62aab2748200 (patch) | |
| tree | fd2452bd709147091ac03f7d458d974e1f8d5ab4 /kernel | |
| parent | 07cd27bbd4d07af6c3e24ae479316a69e7935e1e (diff) | |
| download | op-kernel-dev-b10d22d6e8f76b9e94871aebe0fc62aab2748200.zip op-kernel-dev-b10d22d6e8f76b9e94871aebe0fc62aab2748200.tar.gz | |
kernel/debug: Make use of KGDB_REASON_NMI
Currently kernel never set KGDB_REASON_NMI. We do now, when we enter
KGDB/KDB from an NMI.
This is not to be confused with kgdb_nmicallback(), NMI callback is
an entry for the slave CPUs during CPUs roundup, but REASON_NMI is the
entry for the master CPU.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/debug/kdb/kdb_debugger.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/debug/kdb/kdb_debugger.c b/kernel/debug/kdb/kdb_debugger.c index 8b68ce7..be7b33b 100644 --- a/kernel/debug/kdb/kdb_debugger.c +++ b/kernel/debug/kdb/kdb_debugger.c @@ -12,6 +12,7 @@ #include <linux/kdb.h> #include <linux/kdebug.h> #include <linux/export.h> +#include <linux/hardirq.h> #include "kdb_private.h" #include "../debug_core.h" @@ -52,6 +53,9 @@ int kdb_stub(struct kgdb_state *ks) if (atomic_read(&kgdb_setting_breakpoint)) reason = KDB_REASON_KEYBOARD; + if (in_nmi()) + reason = KDB_REASON_NMI; + for (i = 0, bp = kdb_breakpoints; i < KDB_MAXBPT; i++, bp++) { if ((bp->bp_enabled) && (bp->bp_addr == addr)) { reason = KDB_REASON_BREAK; |
