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
ARM: realview: fix sparsemem build
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
entry-armv.S
diff --git
a/arch/arm/kernel/entry-armv.S
b/arch/arm/kernel/entry-armv.S
index d43c7e54ec6cafd568eb48c337d96c5bc4afa714..32640ae7750f78ce294cba0b22d6e2ad3168927c 100644
(file)
--- a/
arch/arm/kernel/entry-armv.S
+++ b/
arch/arm/kernel/entry-armv.S
@@
-192,6
+192,7
@@
__dabt_svc:
svc_entry
mov r2, sp
dabt_helper
svc_entry
mov r2, sp
dabt_helper
+ THUMB( ldr r5, [sp, #S_PSR] ) @ potentially updated CPSR
svc_exit r5 @ return from exception
UNWIND(.fnend )
ENDPROC(__dabt_svc)
svc_exit r5 @ return from exception
UNWIND(.fnend )
ENDPROC(__dabt_svc)