Title: [3884] trunk:
rename _return_from_exception to _bfin_return_from_exception and export it
- Revision
- 3884
- Author
- vapier
- Date
- 2007-11-16 14:12:11 -0600 (Fri, 16 Nov 2007)
Log Message
rename _return_from_exception to _bfin_return_from_exception and export it
Diffstat
arch/blackfin/kernel/bfin_ksyms.c | 1 +
arch/blackfin/mach-common/entry.S | 8 ++++----
include/asm-blackfin/bfin-global.h | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/bfin_ksyms.c (3883 => 3884)
--- trunk/arch/blackfin/kernel/bfin_ksyms.c 2007-11-16 07:44:08 UTC (rev 3883)
+++ trunk/arch/blackfin/kernel/bfin_ksyms.c 2007-11-16 20:12:11 UTC (rev 3884)
@@ -48,6 +48,7 @@
EXPORT_SYMBOL(__down_interruptible);
EXPORT_SYMBOL(is_in_rom);
+EXPORT_SYMBOL(bfin_return_from_exception);
/* Networking helper routines. */
EXPORT_SYMBOL(csum_partial_copy);
Modified: trunk/arch/blackfin/mach-common/entry.S (3883 => 3884)
--- trunk/arch/blackfin/mach-common/entry.S 2007-11-16 07:44:08 UTC (rev 3883)
+++ trunk/arch/blackfin/mach-common/entry.S 2007-11-16 20:12:11 UTC (rev 3884)
@@ -89,7 +89,7 @@
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 @@
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 @@
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 @@
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
Modified: trunk/include/asm-blackfin/bfin-global.h (3883 => 3884)
--- trunk/include/asm-blackfin/bfin-global.h 2007-11-16 07:44:08 UTC (rev 3883)
+++ trunk/include/asm-blackfin/bfin-global.h 2007-11-16 20:12:11 UTC (rev 3884)
@@ -62,6 +62,7 @@
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);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
