Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[u-boot] / arch / nds32 / lib / interrupts.c

diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c
index 974d52a1a11fcf51ee4042c2fd51f52536f700d6..b4d0adc58f5869f8ac2f2ff3398b577c94656259 100644 (file)
--- a/arch/nds32/lib/interrupts.c
+++ b/arch/nds32/lib/interrupts.c
@@ -59,7 +59,7 @@ void enable_interrupts(void)
 
 /*
  * disable interrupts
- * Return TRUE if GIE is enabled before we disable it.
+ * Return true if GIE is enabled before we disable it.
  */
 int disable_interrupts(void)
 {
@@ -91,7 +91,7 @@ void show_regs(struct pt_regs *regs)
        printf("D1H: %08lx  D1L: %08lx  D0H: %08lx  D0L: %08lx\n",
                regs->d1hi, regs->d1lo, regs->d0hi, regs->d0lo);
        printf("r27: %08lx  r26: %08lx  r25: %08lx  r24: %08lx\n",
-               regs->r[27], regs->r[26], regs->r[25], regs->r[24]);
+               regs->p1, regs->p0, regs->r[25], regs->r[24]);
        printf("r23: %08lx  r22: %08lx  r21: %08lx  r20: %08lx\n",
                regs->r[23], regs->r[22], regs->r[21], regs->r[20]);
        printf("r19: %08lx  r18: %08lx  r17: %08lx  r16: %08lx\n",