projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.11' into next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mm
/
proc-v7-2level.S
diff --git
a/arch/arm/mm/proc-v7-2level.S
b/arch/arm/mm/proc-v7-2level.S
index f64afb9f1bd595a9fb1b9c0cd8bb442c9fda0337..bdd3be4be77aa50c93dcc20c8afdaa3af3c0cf5f 100644
(file)
--- a/
arch/arm/mm/proc-v7-2level.S
+++ b/
arch/arm/mm/proc-v7-2level.S
@@
-110,7
+110,7
@@
ENTRY(cpu_v7_set_pte_ext)
ARM( str r3, [r0, #2048]! )
THUMB( add r0, r0, #2048 )
THUMB( str r3, [r0] )
- ALT_SMP(
mov pc,lr
)
+ ALT_SMP(
W(nop)
)
ALT_UP (mcr p15, 0, r0, c7, c10, 1) @ flush_pte
#endif
mov pc, lr