Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / blackfin / kernel / early_printk.c

diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
index 6ec518a..60f67f9 100644 (file)
--- a/arch/blackfin/kernel/early_printk.c
+++ b/arch/blackfin/kernel/early_printk.c
@@ -187,7 +187,7 @@ asmlinkage void __init init_early_exception_vectors(void)
        bfin_write_EVT15(early_trap);
        CSYNC();
 
-       /* Set all the return from interupt, exception, NMI to a known place
+       /* Set all the return from interrupt, exception, NMI to a known place
         * so if we do a RETI, RETX or RETN by mistake - we go somewhere known
         * Note - don't change RETS - we are in a subroutine, or
         * RETE - since it might screw up if emulator is attached
@@ -205,7 +205,8 @@ asmlinkage void __init early_trap_c(struct pt_regs *fp, void *retaddr)
        if (likely(early_console == NULL))
                setup_early_printk(DEFAULT_EARLY_PORT);
 
-       dump_bfin_regs(fp, retaddr);
+       dump_bfin_mem(fp);
+       show_regs(fp);
        dump_bfin_trace_buffer();
 
        panic("Died early");