Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8b1374 authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

kgdb/kdb: Fix no KDB config problem 



Some code added to the debug_core module had KDB dependencies
that it shouldn't have.  Move the KDB dependent REASON back to
the caller to remove the dependency in the debug core code.

Update the call from the UV NMI handler to conform to the new
interface.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarHedi Berriche <hedi@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/20140114162551.318251993@asylum.americas.sgi.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 981c3a4f

arch/x86/platform/uv/uv_nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static void uv_call_kdb(int cpu, struct pt_regs *regs, int master) 
	if (master) {

		/* call KGDB NMI handler as MASTER */

		ret = kgdb_nmicallin(cpu, X86_TRAP_NMI, regs,

					&uv_nmi_slave_continue);

			KDB_REASON_SYSTEM_NMI, &uv_nmi_slave_continue);

		if (ret) {

			pr_alert("KDB returned error, is kgdboc set?\n");

			atomic_set(&uv_nmi_slave_continue, SLAVE_EXIT);

include/linux/kgdb.h

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ extern int 
kgdb_handle_exception(int ex_vector, int signo, int err_code,

		      struct pt_regs *regs);

extern int kgdb_nmicallback(int cpu, void *regs);

extern int kgdb_nmicallin(int cpu, int trapnr, void *regs, atomic_t *snd_rdy);

extern int kgdb_nmicallin(int cpu, int trapnr, void *regs, int err_code,

			  atomic_t *snd_rdy);

extern void gdbstub_exit(int status);



extern int			kgdb_single_step;

kernel/debug/debug_core.c

+3 −2
Original line number Diff line number Diff line
@@ -736,7 +736,8 @@ int kgdb_nmicallback(int cpu, void *regs) 
	return 1;

}



int kgdb_nmicallin(int cpu, int trapnr, void *regs, atomic_t *send_ready)

int kgdb_nmicallin(int cpu, int trapnr, void *regs, int err_code,

							atomic_t *send_ready)

{

#ifdef CONFIG_SMP

	if (!kgdb_io_ready(0) || !send_ready)
@@ -750,7 +751,7 @@ int kgdb_nmicallin(int cpu, int trapnr, void *regs, atomic_t *send_ready) 
		ks->cpu			= cpu;

		ks->ex_vector		= trapnr;

		ks->signo		= SIGTRAP;

		ks->err_code		= KGDB_KDB_REASON_SYSTEM_NMI;

		ks->err_code		= err_code;

		ks->linux_regs		= regs;

		ks->send_ready		= send_ready;

		kgdb_cpu_enter(ks, regs, DCPU_WANT_MASTER);

kernel/debug/debug_core.h

+0 −2
Original line number Diff line number Diff line
@@ -75,13 +75,11 @@ extern int kdb_stub(struct kgdb_state *ks); 
extern int kdb_parse(const char *cmdstr);

extern int kdb_common_init_state(struct kgdb_state *ks);

extern int kdb_common_deinit_state(void);

#define KGDB_KDB_REASON_SYSTEM_NMI KDB_REASON_SYSTEM_NMI

#else /* ! CONFIG_KGDB_KDB */

static inline int kdb_stub(struct kgdb_state *ks)

{

	return DBG_PASS_EVENT;

}

#define KGDB_KDB_REASON_SYSTEM_NMI 0

#endif /* CONFIG_KGDB_KDB */



#endif /* _DEBUG_CORE_H_ */