3 files changed, 6 insertions, 4 deletions

diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c
index e491633e9d33..0bfbb269e350 100644
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
@@ -48,6 +48,7 @@ EXPORT_SYMBOL(__down_trylock);
 EXPORT_SYMBOL(__down_interruptible);
 
 EXPORT_SYMBOL(is_in_rom);
+EXPORT_SYMBOL(bfin_return_from_exception);
 
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial_copy);
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 54712f9a60ac..573880c01748 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -89,7 +89,7 @@ ENTRY(_ex_workaround_261)
         r6 = retx;
         [p5] = r6;
         cc = r6 == r7;
-        if !cc jump _return_from_exception;
+        if !cc jump _bfin_return_from_exception;
         /* fall through */
         R7 = P4;
         R6 = 0x26;      /* Data CPLB Miss */
@@ -139,7 +139,7 @@ ENTRY(_ex_single_step)
         r7 = retx;
         r6 = reti;
         cc = r7 == r6;
-        if cc jump _return_from_exception
+        if cc jump _bfin_return_from_exception
         r7 = syscfg;
         bitclr (r7, 0);
         syscfg = R7;
@@ -157,7 +157,7 @@ ENTRY(_ex_single_step)
         cc = r6 == r7;
         if !cc jump _ex_trap_c;
 
-ENTRY(_return_from_exception)
+ENTRY(_bfin_return_from_exception)
         DEBUG_START_HWTRACE(p5, r7)
 #if ANOMALY_05000257
         R7=LC0;
@@ -862,7 +862,7 @@ ENTRY(_ex_trace_buff_full)
         LC0 = [sp++];
         P2 = [sp++];
         P3 = [sp++];
-        jump _return_from_exception;
+        jump _bfin_return_from_exception;
 ENDPROC(_ex_trace_buff_full)
 
 #if CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN == 4
diff --git a/include/asm-blackfin/bfin-global.h b/include/asm-blackfin/bfin-global.h
index cd924bb6f2e7..6ef501b35df0 100644
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
@@ -62,6 +62,7 @@ extern void bfin_dcache_init(void);
 extern int read_iloc(void);
 extern int bfin_console_init(void);
 extern asmlinkage void lower_to_irq14(void);
+extern asmlinkage void bfin_return_from_exception(void);
 extern void init_exception_vectors(void);
 extern void init_dma(void);
 extern void program_IAR(void);