[PATCH] arm64: put __boot_cpu_mode label after alignment instead of before

[PATCH] arm64: put __boot_cpu_mode label after alignment instead of before

[Ard Biesheuvel]

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>
---
 arch/arm64/kernel/head.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 3e300bfb0089..9c856f2aa7a5 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -557,8 +557,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
-- 
1.8.3.2

[PATCH] arm64: put __boot_cpu_mode label after alignment instead of before

[Mark Rutland]

On Fri, Mar 13, 2015 at 03:21:18PM +0000, Ard Biesheuvel wrote:
> 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>

Given I managed to produce the exact same patch, this obviously looks
good to me:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
>  arch/arm64/kernel/head.S | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
> index 3e300bfb0089..9c856f2aa7a5 100644
> --- a/arch/arm64/kernel/head.S
> +++ b/arch/arm64/kernel/head.S
> @@ -557,8 +557,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
> -- 
> 1.8.3.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

[PATCH] arm64: put __boot_cpu_mode label after alignment instead of before

[Mark Rutland]

On Mon, Mar 16, 2015 at 10:52:07AM +0000, Mark Rutland wrote:
> On Fri, Mar 13, 2015 at 03:21:18PM +0000, Ard Biesheuvel wrote:
> > 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>
> 
> Given I managed to produce the exact same patch, this obviously looks
> good to me:
> 
> Acked-by: Mark Rutland <mark.rutland@arm.com>

... and now I disocver this is already in v4.0-rc4.

Never mind :)

Mark.