From: Sricharan R <r.sricharan@ti.com>
Date: Tue, 29 Oct 2013 06:29:56 +0000 (+0100)
Subject: ARM: 7870/1: head: Fix the missing underscore in __ARMEB__ macro and .align keyword
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=830fd4d6de1785942e34babe0a8984f72b534b25;p=linux-beck.git

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>
---

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 54547947a4e9..32402ba6710a 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)