diff options
Diffstat (limited to 'kernel/debug')
-rw-r--r-- | kernel/debug/debug_core.c | 5 | ||||
-rw-r--r-- | kernel/debug/debug_core.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index 7d2f35e5df2f..334b3980ffc1 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c | |||
@@ -736,7 +736,8 @@ int kgdb_nmicallback(int cpu, void *regs) | |||
736 | return 1; | 736 | return 1; |
737 | } | 737 | } |
738 | 738 | ||
739 | int kgdb_nmicallin(int cpu, int trapnr, void *regs, atomic_t *send_ready) | 739 | int kgdb_nmicallin(int cpu, int trapnr, void *regs, int err_code, |
740 | atomic_t *send_ready) | ||
740 | { | 741 | { |
741 | #ifdef CONFIG_SMP | 742 | #ifdef CONFIG_SMP |
742 | if (!kgdb_io_ready(0) || !send_ready) | 743 | if (!kgdb_io_ready(0) || !send_ready) |
@@ -750,7 +751,7 @@ int kgdb_nmicallin(int cpu, int trapnr, void *regs, atomic_t *send_ready) | |||
750 | ks->cpu = cpu; | 751 | ks->cpu = cpu; |
751 | ks->ex_vector = trapnr; | 752 | ks->ex_vector = trapnr; |
752 | ks->signo = SIGTRAP; | 753 | ks->signo = SIGTRAP; |
753 | ks->err_code = KGDB_KDB_REASON_SYSTEM_NMI; | 754 | ks->err_code = err_code; |
754 | ks->linux_regs = regs; | 755 | ks->linux_regs = regs; |
755 | ks->send_ready = send_ready; | 756 | ks->send_ready = send_ready; |
756 | kgdb_cpu_enter(ks, regs, DCPU_WANT_MASTER); | 757 | kgdb_cpu_enter(ks, regs, DCPU_WANT_MASTER); |
diff --git a/kernel/debug/debug_core.h b/kernel/debug/debug_core.h index 572aa4f5677c..127d9bc49fb4 100644 --- a/kernel/debug/debug_core.h +++ b/kernel/debug/debug_core.h | |||
@@ -75,13 +75,11 @@ extern int kdb_stub(struct kgdb_state *ks); | |||
75 | extern int kdb_parse(const char *cmdstr); | 75 | extern int kdb_parse(const char *cmdstr); |
76 | extern int kdb_common_init_state(struct kgdb_state *ks); | 76 | extern int kdb_common_init_state(struct kgdb_state *ks); |
77 | extern int kdb_common_deinit_state(void); | 77 | extern int kdb_common_deinit_state(void); |
78 | #define KGDB_KDB_REASON_SYSTEM_NMI KDB_REASON_SYSTEM_NMI | ||
79 | #else /* ! CONFIG_KGDB_KDB */ | 78 | #else /* ! CONFIG_KGDB_KDB */ |
80 | static inline int kdb_stub(struct kgdb_state *ks) | 79 | static inline int kdb_stub(struct kgdb_state *ks) |
81 | { | 80 | { |
82 | return DBG_PASS_EVENT; | 81 | return DBG_PASS_EVENT; |
83 | } | 82 | } |
84 | #define KGDB_KDB_REASON_SYSTEM_NMI 0 | ||
85 | #endif /* CONFIG_KGDB_KDB */ | 83 | #endif /* CONFIG_KGDB_KDB */ |
86 | 84 | ||
87 | #endif /* _DEBUG_CORE_H_ */ | 85 | #endif /* _DEBUG_CORE_H_ */ |