diff options
| author | Sricharan R <r.sricharan@ti.com> | 2013-10-29 07:29:56 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-29 10:58:52 +0000 |
| commit | 830fd4d6de1785942e34babe0a8984f72b534b25 (patch) | |
| tree | f94ca20b2d40485d4cf096dafe20f66a8c77ee5f /arch | |
| parent | bdbf0a4cf2af7867dfdd09ed1d0e381eac188551 (diff) | |
| download | op-kernel-dev-830fd4d6de1785942e34babe0a8984f72b534b25.zip op-kernel-dev-830fd4d6de1785942e34babe0a8984f72b534b25.tar.gz | |
ARM: 7870/1: head: Fix the missing underscore in __ARMEB__ macro and .align keyword
Commit 'f52bb722547f43caeaecbcc62db9f3c3b80ead9b'
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/head.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 5454794..32402ba 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -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) |
