evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Sricharan R 2013-10-29 07:29:56 +01:00 • committed by Russell King
parent bdbf0a4cf2
commit 830fd4d6de
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/kernel/head.S
View file

@ -536,7 +536,7 @@ ENTRY(fixup_smp)
ldmfd sp!, {r4 - r6, pc} ldmfd sp!, {r4 - r6, pc}
ENDPROC(fixup_smp) ENDPROC(fixup_smp)
#ifdef __ARMEB_ #ifdef __ARMEB__
#define LOW_OFFSET 0x4 #define LOW_OFFSET 0x4
#define HIGH_OFFSET 0x0 #define HIGH_OFFSET 0x0
#else #else
@ -632,6 +632,7 @@ __fixup_a_pv_table:
#endif #endif
ENDPROC(__fixup_a_pv_table) ENDPROC(__fixup_a_pv_table)
.align
3: .long __pv_offset 3: .long __pv_offset
ENTRY(fixup_pv_table) ENTRY(fixup_pv_table)