Skip to contentSkip to conversation

arm64: put __boot_cpu_mode label after alignment instead of before

PATCH New Ard Biesheuvel 2 participants 3 messages Mar 13, 2015 – Mar 16, 2015 arm64

lore
Share & tools
lore

Ard Biesheuvel

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm64/kernel/head.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/head.S +1 -1
index 3e300bfb0089..9c856f2aa7a5 100644
@@ -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
Signature · 1 line
1.8.3.2
reviewer
#1 lore raw

PATCH 1/1 arm64: put __boot_cpu_mode label after alignment instead of before

Quoted 4 lines · 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 <[email protected]>

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

Acked-by Mark Rutland <[email protected]>

Mark.

Quoted 27 lines
---
 arch/arm64/kernel/head.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/head.S +1 -1
index 3e300bfb0089..9c856f2aa7a5 100644
@@ -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
Signature · 7 lines
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
reviewer
#2 lore raw

PATCH 1/1 arm64: put __boot_cpu_mode label after alignment instead of before

Quoted 10 lines · Mark Rutland
Quoted 4 lines · 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 <[email protected]>

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

Acked-by Mark Rutland <[email protected]>

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

Never mind :)

Mark.