summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2015-03-13 16:21:18 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2015-03-14 11:02:26 +0000
commit947bb7587fc2c1d1f6b89462ef1255ec30d4e682 (patch)
treef9b780d2292da6a91a1a3d4fcecf866441b7a623 /arch/arm64/kernel
parent60c0d45a7f7ab4e30452fa14deb23a33e29adbc2 (diff)
downloadblackbird-obmc-linux-947bb7587fc2c1d1f6b89462ef1255ec30d4e682.tar.gz
blackbird-obmc-linux-947bb7587fc2c1d1f6b89462ef1255ec30d4e682.zip
arm64: put __boot_cpu_mode label after alignment instead of before
Another one for the big head.S spring cleaning: the label should be after the .align or it may point to the padding. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 8ce88e08c030..07f930540f4a 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -585,8 +585,8 @@ ENDPROC(set_cpu_boot_mode_flag)
* zeroing of .bss would clobber it.
*/
.pushsection .data..cacheline_aligned
-ENTRY(__boot_cpu_mode)
.align L1_CACHE_SHIFT
+ENTRY(__boot_cpu_mode)
.long BOOT_CPU_MODE_EL2
.long 0
.popsection
OpenPOWER on IntegriCloud