From 38c8c97fb9c44c0e38f0e43e6fdfc485b7d7a9de Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 18 Nov 2008 17:48:22 +0800 Subject: [PATCH] --- yaml --- r: 127047 b: refs/heads/master c: 33c8691f45459a41864562ae8d1ec12b4503f200 h: refs/heads/master i: 127045: 7a4932a61d0de47ba199e70a72c3c48f81c3b575 127043: f7aa0895a7d998febaaaa0affe0c61f0b0eed4e6 127039: 47257d9ea094e664d9d8d7ff748e7bf29dbb72a7 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-common/entry.S | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 60814296fece..12ca86c56207 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36f649a55aa3ad1e2196403ba95a652f9900bc50 +refs/heads/master: 33c8691f45459a41864562ae8d1ec12b4503f200 diff --git a/trunk/arch/blackfin/mach-common/entry.S b/trunk/arch/blackfin/mach-common/entry.S index e22c0a5cf32d..0efd5f5b7ba0 100644 --- a/trunk/arch/blackfin/mach-common/entry.S +++ b/trunk/arch/blackfin/mach-common/entry.S @@ -370,9 +370,10 @@ ENTRY(_ex_trap_c) ENDPROC(_ex_trap_c) /* We just realized we got an exception, while we were processing a different - * exception. This is a unrecoverable event, so crash + * exception. This is a unrecoverable event, so crash. + * Note: this cannot be ENTRY() as we jump here with "if cc jump" ... */ -ENTRY(_double_fault) +_double_fault: /* Turn caches & protection off, to ensure we don't get any more * double exceptions */