Skip to content

Commit

Permalink
[POWERPC] Cleanup include/asm-powerpc/xmon.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Oct 4, 2006
1 parent 14b1ffb commit 23b8acb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
4 changes: 0 additions & 4 deletions include/asm-powerpc/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
22 changes: 14 additions & 8 deletions include/asm-powerpc/xmon.h
Original file line number Diff line number Diff line change
@@ -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 */

0 comments on commit 23b8acb

Please sign in to comment.