projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'lro'
[powerpc.git]
/
arch
/
arm
/
mm
/
abort-ev6.S
diff --git
a/arch/arm/mm/abort-ev6.S
b/arch/arm/mm/abort-ev6.S
index
8f76f3d
..
8a7f65b
100644
(file)
--- a/
arch/arm/mm/abort-ev6.S
+++ b/
arch/arm/mm/abort-ev6.S
@@
-20,6
+20,11
@@
*/
.align 5
ENTRY(v6_early_abort)
+#ifdef CONFIG_CPU_32v6K
+ clrex
+#else
+ strex r0, r1, [sp] @ Clear the exclusive monitor
+#endif
mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR
/*