openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt 2005-11-07 16:43:44 +11:00 committed by Paul Mackerras
parent 21fe3301f1
commit 7b007de8a9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ppc/kernel/traps.c
View File

@ -49,7 +49,7 @@ extern int xmon_sstep(struct pt_regs *regs);
extern int xmon_iabr_match(struct pt_regs *regs); extern int xmon_iabr_match(struct pt_regs *regs);
extern int xmon_dabr_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_bpt)(struct pt_regs *regs) = xmon_bpt;
int (*debugger_sstep)(struct pt_regs *regs) = xmon_sstep; int (*debugger_sstep)(struct pt_regs *regs) = xmon_sstep;
int (*debugger_iabr_match)(struct pt_regs *regs) = xmon_iabr_match; 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); void (*debugger_fault_handler)(struct pt_regs *regs);
#else #else
#ifdef CONFIG_KGDB #ifdef CONFIG_KGDB
void (*debugger)(struct pt_regs *regs); int (*debugger)(struct pt_regs *regs);
int (*debugger_bpt)(struct pt_regs *regs); int (*debugger_bpt)(struct pt_regs *regs);
int (*debugger_sstep)(struct pt_regs *regs); int (*debugger_sstep)(struct pt_regs *regs);
int (*debugger_iabr_match)(struct pt_regs *regs); int (*debugger_iabr_match)(struct pt_regs *regs);

5
arch/ppc/xmon/xmon.c
View File

@ -220,8 +220,7 @@ static void get_tb(unsigned *p)
p[1] = lo; p[1] = lo;
} }
void int xmon(struct pt_regs *excp)
xmon(struct pt_regs *excp)
{ {
struct pt_regs regs; struct pt_regs regs;
int msr, cmd; int msr, cmd;
@ -290,6 +289,8 @@ xmon(struct pt_regs *excp)
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
set_msr(msr); /* restore interrupt enable */ set_msr(msr); /* restore interrupt enable */
get_tb(start_tb[smp_processor_id()]); get_tb(start_tb[smp_processor_id()]);
return cmd != 'X';
} }
irqreturn_t irqreturn_t

2
include/asm-ppc/kgdb.h
View File

@ -31,7 +31,7 @@ extern void breakpoint(void);
/* For taking exceptions /* For taking exceptions
* these are defined in traps.c * 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_bpt)(struct pt_regs *regs);
extern int (*debugger_sstep)(struct pt_regs *regs); extern int (*debugger_sstep)(struct pt_regs *regs);
extern int (*debugger_iabr_match)(struct pt_regs *regs); extern int (*debugger_iabr_match)(struct pt_regs *regs);