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 'fixes' into cleanups
[oweals/u-boot.git]
/
cpu
/
mpc85xx
/
traps.c
diff --git
a/cpu/mpc85xx/traps.c
b/cpu/mpc85xx/traps.c
index fd36658cb077a2bd8c57a719c089d02515bb0184..1045cc1e7d08f4aec72a9f2c9df026fb15318f57 100644
(file)
--- a/
cpu/mpc85xx/traps.c
+++ b/
cpu/mpc85xx/traps.c
@@
-216,10
+216,10
@@
MachineCheckException(struct pt_regs *regs)
if (machinecheck_count > 1) {
regs->nip += 4; /* skip offending instruction */
if (machinecheck_count > 1) {
regs->nip += 4; /* skip offending instruction */
- printf("Skipping current instr, Returning to 0x%08x\n",
+ printf("Skipping current instr, Returning to 0x%08
l
x\n",
regs->nip);
} else {
regs->nip);
} else {
- printf("Returning back to 0x%08x\n",regs->nip);
+ printf("Returning back to 0x%08
l
x\n",regs->nip);
}
}
}
}
@@
-290,7
+290,7
@@
UnknownException(struct pt_regs *regs)
void
ExtIntException(struct pt_regs *regs)
{
void
ExtIntException(struct pt_regs *regs)
{
- volatile ccsr_pic_t *pic = (void *)(C
FG
_MPC85xx_PIC_ADDR);
+ volatile ccsr_pic_t *pic = (void *)(C
ONFIG_SYS
_MPC85xx_PIC_ADDR);
uint vect;
uint vect;
@@
-302,7
+302,7
@@
ExtIntException(struct pt_regs *regs)
printf("External Interrupt Exception at PC: %lx, SR: %lx, vector=%lx",
regs->nip, regs->msr, regs->trap);
vect = pic->iack0;
printf("External Interrupt Exception at PC: %lx, SR: %lx, vector=%lx",
regs->nip, regs->msr, regs->trap);
vect = pic->iack0;
- printf(" irq IACK0@%05x=%d\n",&pic->iack0,vect);
+ printf(" irq IACK0@%05x=%d\n",
(int)
&pic->iack0,vect);
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
machinecheck_count++;
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
machinecheck_count++;
@@
-310,7
+310,7
@@
ExtIntException(struct pt_regs *regs)
printf("Returning back to 0x%08x\n",regs->nip);
#else
regs->nip += 4; /* skip offending instruction */
printf("Returning back to 0x%08x\n",regs->nip);
#else
regs->nip += 4; /* skip offending instruction */
- printf("Skipping current instr, Returning to 0x%08x\n",regs->nip);
+ printf("Skipping current instr, Returning to 0x%08
l
x\n",regs->nip);
#endif
}
#endif
}