summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq
diff options
context:
space:
mode:
authorNathan Lynch <nathan_lynch@mentor.com>2015-07-17 23:01:02 +0200
committerMichal Simek <michal.simek@xilinx.com>2015-07-31 10:24:41 +0200
commite4a9288942392965bd5cfad93d9996b83c0dc4a6 (patch)
treecf16ad134ce059fb5a9b235603a49d0b94efdd4f /arch/arm/mach-zynq
parentclk: zynq: remove redundant $(CONFIG_ARCH_ZYNQ) in Makefile (diff)
downloadlinux-e4a9288942392965bd5cfad93d9996b83c0dc4a6.tar.xz
linux-e4a9288942392965bd5cfad93d9996b83c0dc4a6.zip
ARM: zynq: reserve space for jump target in secondary trampoline
Add a zero argument to the .word directive in zynq_secondary_trampoline. Without an expression the assembler emits nothing for the .word directive. This makes it so that the intended range is communicated to ioremap and outer_flush_range in zynq_cpun_start; e.g. for LE trampoline_code_size evaluates to 12 now instead of 8. Found by inspection. I'm not aware of any real problem this fixes. Tested by doing on online/offline loop on ZC702. Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r--arch/arm/mach-zynq/headsmp.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S
index 045c72720a4d..f6d5de073e34 100644
--- a/arch/arm/mach-zynq/headsmp.S
+++ b/arch/arm/mach-zynq/headsmp.S
@@ -18,7 +18,7 @@ ARM_BE8(rev r0, r0)
.globl zynq_secondary_trampoline_jump
zynq_secondary_trampoline_jump:
/* Space for jumping address */
- .word /* cpu 1 */
+ .word 0 /* cpu 1 */
.globl zynq_secondary_trampoline_end
zynq_secondary_trampoline_end:
ENDPROC(zynq_secondary_trampoline)