[PATCH v2 7/9] ARM: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
dave.martin at linaro.org
Mon Nov 22 13:39:29 EST 2010
On Mon, Nov 22, 2010 at 6:28 PM, Nicolas Pitre <nico at fluxnic.net> wrote:
>> Applies on v2.6.37-rc3.
> Ideally you should keep that line above outside of the actual commit log
> text, as no one will care on what version it applies to once it is
> merged. It is best to put that below the --- line, or omit it entirely
> if using 'git send-email'.
OK, I'll leave it out in the future...
>> Signed-off-by: Dave Martin <dave.martin at linaro.org>
>> Acked-by: Catalin Marinas <catalin.marinas at arm.com>
>> Acked-by: Nicolas Pitre <nicolas.pitre at linaro.org>
> Looking at it again there is a problem with the patch as is...
>> --- a/arch/arm/boot/compressed/head.S
>> +++ b/arch/arm/boot/compressed/head.S
>> @@ -125,16 +125,21 @@ wait: mrc p14, 0, pc, c0, c1, 0
>> * sort out different calling conventions
>> + .arm @ Always enter in ARM state
>> .type start,#function
>> - .rept 8
>> + THUMB( adr r12, BSYM(1f) )
>> + THUMB( bx r12 )
>> + THUMB( .rept 6 )
>> + ARM( .rept 8 )
>> mov r0, r0
>> - b 1f
>> + nop @ Pad magic number to 0x24
> Why is this branch removed? With an ARM mode kernel this means we'll
> attempt to execute the magic number that follows.
Hmmm, I think I got confused during a branch merge...
I will retest and repost this patch as appropriate.
More information about the linux-arm-kernel