[PATCH] Fix the machine description printing in __error_a

Uwe Kleine-König u.kleine-koenig at pengutronix.de
Thu Nov 5 13:28:18 EST 2009


On Thu, Nov 05, 2009 at 12:41:49PM +0000, Catalin Marinas wrote:
> Commit b86040a59f changed label 3 in head-common.S but only modified
> __lookup_machine_type. This patch corrects the __error_a function as
> well.
> 
> Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
> ---
>  arch/arm/kernel/head-common.S |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
> index 885a721..b9505aa 100644
> --- a/arch/arm/kernel/head-common.S
> +++ b/arch/arm/kernel/head-common.S
> @@ -97,7 +97,7 @@ __error_a:
>  	bl	printhex8
>  	adr	r0, str_a2
>  	bl	printascii
> -	adr	r3, 3f
> +	adr	r3, 4f
>  	ldmia	r3, {r4, r5, r6}		@ get machine desc list
>  	sub	r4, r3, r4			@ get offset between virt&phys
>  	add	r5, r5, r4			@ convert virt addresses to
Acked-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>

-- 
Pengutronix e.K.                              | Uwe Kleine-König            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |



More information about the linux-arm-kernel mailing list