From 527d8cc3dc80b666bbf257b52eb00448f83987ea Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Wed, 10 Jun 2009 06:11:21 +0000 Subject: [PATCH] --- yaml --- r: 151140 b: refs/heads/master c: 54ebae7166275a618f0228138e67ff7d10a3b9d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/early_printk.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3b11f64e2cd..1a516b45c292 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86f2008bf546af9a434f480710e8d33891616bf5 +refs/heads/master: 54ebae7166275a618f0228138e67ff7d10a3b9d0 diff --git a/trunk/arch/blackfin/kernel/early_printk.c b/trunk/arch/blackfin/kernel/early_printk.c index 3302719173ca..2ab56811841c 100644 --- a/trunk/arch/blackfin/kernel/early_printk.c +++ b/trunk/arch/blackfin/kernel/early_printk.c @@ -202,11 +202,15 @@ asmlinkage void __init init_early_exception_vectors(void) asmlinkage void __init early_trap_c(struct pt_regs *fp, void *retaddr) { /* This can happen before the uart is initialized, so initialize - * the UART now + * the UART now (but only if we are running on the processor we think + * we are compiled for - otherwise we write to MMRs that don't exist, + * and cause other problems. Nothing comes out the UART, but it does + * end up in the __buf_log. */ - if (likely(early_console == NULL)) + if (likely(early_console == NULL) && CPUID == bfin_cpuid()) setup_early_printk(DEFAULT_EARLY_PORT); + printk(KERN_EMERG "Early panic\n"); dump_bfin_mem(fp); show_regs(fp); dump_bfin_trace_buffer();