projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
mm
/
proc-v7-3level.S
diff --git
a/arch/arm/mm/proc-v7-3level.S
b/arch/arm/mm/proc-v7-3level.S
index 6ffd78c0f9abeeacf0295dd888a9b537e9249604..363027e811d6f5c803d7616c318d4aeab7bfb3e9 100644
(file)
--- a/
arch/arm/mm/proc-v7-3level.S
+++ b/
arch/arm/mm/proc-v7-3level.S
@@
-73,7
+73,8
@@
ENTRY(cpu_v7_set_pte_ext)
tst r3, #1 << (55 - 32) @ L_PTE_DIRTY
orreq r2, #L_PTE_RDONLY
1: strd r2, r3, [r0]
- mcr p15, 0, r0, c7, c10, 1 @ flush_pte
+ ALT_SMP(mov pc, lr)
+ ALT_UP (mcr p15, 0, r0, c7, c10, 1) @ flush_pte
#endif
mov pc, lr
ENDPROC(cpu_v7_set_pte_ext)