git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
blackfin
/
mach-common
/
lock.S
diff --git
a/arch/blackfin/mach-common/lock.S
b/arch/blackfin/mach-common/lock.S
index 9daf01201e9fd86e111ffa4b85ca0e5dd4974788..6c5f5f0ea7fe1b5d7ee7685f1ece3dceb09f9899 100644
(file)
--- a/
arch/blackfin/mach-common/lock.S
+++ b/
arch/blackfin/mach-common/lock.S
@@
-160,7
+160,7
@@
ENDPROC(_cache_grab_lock)
* R0 - Which way to be locked
*/
-ENTRY(_cache_lock)
+ENTRY(_
bfin_
cache_lock)
[--SP]=( R7:0,P5:0 );
@@
-184,7
+184,7
@@
ENTRY(_cache_lock)
( R7:0,P5:0 ) = [SP++];
RTS;
-ENDPROC(_cache_lock)
+ENDPROC(_
bfin_
cache_lock)
/* Invalidate the Entire Instruction cache by
* disabling IMC bit