diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-10-03 14:12:07 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-04 14:52:17 +1000 |
| commit | 23b8acb1cf49fea74a9d431de258787384951eac (patch) | |
| tree | 21fb39418c3f6504830698309adbfbbc1250be29 | |
| parent | 14b1ffb577a8678e228683bd015302cfe964040c (diff) | |
[POWERPC] Cleanup include/asm-powerpc/xmon.h
For some reason we have two prototypes for xmon_init(), remove the
one in system.h.
No one calls xmon() anymore, debugger() is preferable, so we don't
need the prototype. And similarly no one calls xmon_printf().
Also update the include guards on xmon.h to match the standard
format, add copyright and license, and add comments to #endifs.
Built for pseries_defconfig and pmac32_defconfig.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | include/asm-powerpc/system.h | 4 | ||||
| -rw-r--r-- | include/asm-powerpc/xmon.h | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index 4b41deaa8d8d..43627596003b 100644 --- a/include/asm-powerpc/system.h +++ b/include/asm-powerpc/system.h @@ -91,10 +91,6 @@ DEBUGGER_BOILERPLATE(debugger_iabr_match) DEBUGGER_BOILERPLATE(debugger_dabr_match) DEBUGGER_BOILERPLATE(debugger_fault_handler) -#ifdef CONFIG_XMON -extern void xmon_init(int enable); -#endif - #else static inline int debugger(struct pt_regs *regs) { return 0; } static inline int debugger_ipi(struct pt_regs *regs) { return 0; } diff --git a/include/asm-powerpc/xmon.h b/include/asm-powerpc/xmon.h index 43f7129984c7..c02dd0ce13ac 100644 --- a/include/asm-powerpc/xmon.h +++ b/include/asm-powerpc/xmon.h @@ -1,12 +1,18 @@ -#ifndef __PPC_XMON_H -#define __PPC_XMON_H -#ifdef __KERNEL__ +#ifndef __ASM_POWERPC_XMON_H +#define __ASM_POWERPC_XMON_H + +/* + * Copyrignt (C) 2006 IBM Corp + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ -struct pt_regs; +#ifdef __KERNEL__ -extern int xmon(struct pt_regs *excp); -extern void xmon_printf(const char *fmt, ...); extern void xmon_init(int); -#endif -#endif +#endif /* __KERNEL __ */ +#endif /* __ASM_POWERPC_XMON_H */ |