aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-common/entry.S
diff options
context:
space:
mode:
authorMike Frysinger <michael.frysinger@analog.com>2007-11-21 02:53:49 -0500
committerBryan Wu <bryan.wu@analog.com>2007-11-21 02:53:49 -0500
commit8d6c242062b90ce1b339e32a12fe183fe9612dcb (patch)
tree3e28305dd1754e416d88a4ce5021dff7f8087532 /arch/blackfin/mach-common/entry.S
parentd0025e5edf0e593da599358d70fdade47c3b703e (diff)
Blackfin arch: rename _return_from_exception to _bfin_return_from_exception and export it
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/mach-common/entry.S')
-rw-r--r--arch/blackfin/mach-common/entry.S8
1 files changed, 4 insertions, 4 deletions
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)
89 r6 = retx; 89 r6 = retx;
90 [p5] = r6; 90 [p5] = r6;
91 cc = r6 == r7; 91 cc = r6 == r7;
92 if !cc jump _return_from_exception; 92 if !cc jump _bfin_return_from_exception;
93 /* fall through */ 93 /* fall through */
94 R7 = P4; 94 R7 = P4;
95 R6 = 0x26; /* Data CPLB Miss */ 95 R6 = 0x26; /* Data CPLB Miss */
@@ -139,7 +139,7 @@ ENTRY(_ex_single_step)
139 r7 = retx; 139 r7 = retx;
140 r6 = reti; 140 r6 = reti;
141 cc = r7 == r6; 141 cc = r7 == r6;
142 if cc jump _return_from_exception 142 if cc jump _bfin_return_from_exception
143 r7 = syscfg; 143 r7 = syscfg;
144 bitclr (r7, 0); 144 bitclr (r7, 0);
145 syscfg = R7; 145 syscfg = R7;
@@ -157,7 +157,7 @@ ENTRY(_ex_single_step)
157 cc = r6 == r7; 157 cc = r6 == r7;
158 if !cc jump _ex_trap_c; 158 if !cc jump _ex_trap_c;
159 159
160ENTRY(_return_from_exception) 160ENTRY(_bfin_return_from_exception)
161 DEBUG_START_HWTRACE(p5, r7) 161 DEBUG_START_HWTRACE(p5, r7)
162#if ANOMALY_05000257 162#if ANOMALY_05000257
163 R7=LC0; 163 R7=LC0;
@@ -862,7 +862,7 @@ ENTRY(_ex_trace_buff_full)
862 LC0 = [sp++]; 862 LC0 = [sp++];
863 P2 = [sp++]; 863 P2 = [sp++];
864 P3 = [sp++]; 864 P3 = [sp++];
865 jump _return_from_exception; 865 jump _bfin_return_from_exception;
866ENDPROC(_ex_trace_buff_full) 866ENDPROC(_ex_trace_buff_full)
867 867
868#if CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN == 4 868#if CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN == 4