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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
entry-header.S
diff --git
a/arch/arm/kernel/entry-header.S
b/arch/arm/kernel/entry-header.S
index efb208de75ec55067882afb0b2be768b78637a54..5d702f8900b106bceaf6f006b5b186103a0bf269 100644
(file)
--- a/
arch/arm/kernel/entry-header.S
+++ b/
arch/arm/kernel/entry-header.S
@@
-37,9
+37,9
@@
#endif
.endm
- .macro alignment_trap, rtemp
+ .macro alignment_trap, rtemp
, label
#ifdef CONFIG_ALIGNMENT_TRAP
- ldr \rtemp,
.LCcralign
+ ldr \rtemp,
\label
ldr \rtemp, [\rtemp]
mcr p15, 0, \rtemp, c1, c0
#endif