Commit 830fd4d6 authored Oct 29, 2013 by Sricharan R Committed by Russell King Oct 29, 2013

ARM: 7870/1: head: Fix the missing underscore in ARMEB macro and .align keyword



Commit 'f52bb722'
Author: Sricharan R <r.sricharan@ti.com>
    ARM: mm: Correct virt_to_phys patching for 64 bit physical addresses

introduced a __ARMEB__ macro usage in a new place, but missed the second
underscore. So correcting it here.

Also a explicit .align keyword is needed for the label with .long
data-type to be aligned on the 4 byte boundary. Otherwise this can
cause problem for thumb2 build. So adding it here.

Signed-off-by: Sricharan R <r.sricharan@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent bdbf0a4c

arch/arm/kernel/head.S

+2 −1

Original line number	Diff line number	Diff line
		@@ -536,7 +536,7 @@ ENTRY(fixup_smp)
		ldmfd sp!, {r4 - r6, pc}
		ENDPROC(fixup_smp)

		#ifdef __ARMEB_
		#ifdef __ARMEB__
		#define LOW_OFFSET 0x4
		#define HIGH_OFFSET 0x0
		#else
		@@ -632,6 +632,7 @@ __fixup_a_pv_table:
		#endif
		ENDPROC(__fixup_a_pv_table)

		.align
		3: .long __pv_offset

		ENTRY(fixup_pv_table)

Admin message