projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next
[oweals/u-boot.git]
/
cpu
/
74xx_7xx
/
traps.c
diff --git
a/cpu/74xx_7xx/traps.c
b/cpu/74xx_7xx/traps.c
index 50c5eeb4835802635bf1e0eec0fe880e2bfe0171..b06622769699e66fdc45b36639fb4d9bd9424863 100644
(file)
--- a/
cpu/74xx_7xx/traps.c
+++ b/
cpu/74xx_7xx/traps.c
@@
-40,7
+40,7
@@
DECLARE_GLOBAL_DATA_PTR;
#endif
DECLARE_GLOBAL_DATA_PTR;
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif
int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif
@@
-133,7
+133,7
@@
MachineCheckException(struct pt_regs *regs)
return;
}
return;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
@@
-166,7
+166,7
@@
MachineCheckException(struct pt_regs *regs)
void
AlignmentException(struct pt_regs *regs)
{
void
AlignmentException(struct pt_regs *regs)
{
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
@@
-181,7
+181,7
@@
ProgramCheckException(struct pt_regs *regs)
unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL;
int i, j;
unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL;
int i, j;
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
@@
-204,7
+204,7
@@
ProgramCheckException(struct pt_regs *regs)
void
SoftEmuException(struct pt_regs *regs)
{
void
SoftEmuException(struct pt_regs *regs)
{
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
@@
-217,7
+217,7
@@
SoftEmuException(struct pt_regs *regs)
void
UnknownException(struct pt_regs *regs)
{
void
UnknownException(struct pt_regs *regs)
{
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif