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

Commit 7b007de8 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[PATCH] ppc: Fix ARCH=ppc build with xmon 



xmon() prototype is inconsistent between ARCH=ppc and ARCH=powerpc,
thus causing ARCH=ppc build breakage.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 21fe3301

arch/ppc/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ extern int xmon_sstep(struct pt_regs *regs); 
extern int xmon_iabr_match(struct pt_regs *regs);

extern int xmon_dabr_match(struct pt_regs *regs);



void (*debugger)(struct pt_regs *regs) = xmon;

int (*debugger)(struct pt_regs *regs) = xmon;

int (*debugger_bpt)(struct pt_regs *regs) = xmon_bpt;

int (*debugger_sstep)(struct pt_regs *regs) = xmon_sstep;

int (*debugger_iabr_match)(struct pt_regs *regs) = xmon_iabr_match;
@@ -57,7 +57,7 @@ int (*debugger_dabr_match)(struct pt_regs *regs) = xmon_dabr_match; 
void (*debugger_fault_handler)(struct pt_regs *regs);

#else

#ifdef CONFIG_KGDB

void (*debugger)(struct pt_regs *regs);

int (*debugger)(struct pt_regs *regs);

int (*debugger_bpt)(struct pt_regs *regs);

int (*debugger_sstep)(struct pt_regs *regs);

int (*debugger_iabr_match)(struct pt_regs *regs);

arch/ppc/xmon/xmon.c

+3 −2
Original line number Diff line number Diff line
@@ -220,8 +220,7 @@ static void get_tb(unsigned *p) 
	p[1] = lo;

}



void

xmon(struct pt_regs *excp)

int xmon(struct pt_regs *excp)

{

	struct pt_regs regs;

	int msr, cmd;
@@ -290,6 +289,8 @@ xmon(struct pt_regs *excp) 
#endif /* CONFIG_SMP */

	set_msr(msr);		/* restore interrupt enable */

	get_tb(start_tb[smp_processor_id()]);



	return cmd != 'X';

}



irqreturn_t

include/asm-ppc/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ extern void breakpoint(void); 
/* For taking exceptions

 * these are defined in traps.c

 */

extern void (*debugger)(struct pt_regs *regs);

extern int (*debugger)(struct pt_regs *regs);

extern int (*debugger_bpt)(struct pt_regs *regs);

extern int (*debugger_sstep)(struct pt_regs *regs);

extern int (*debugger_iabr_match)(struct pt_regs *regs);