From ec3624f2cb5da0a5185455cdf2414a329586f605 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Wed, 11 Apr 2012 14:52:55 +0100 Subject: [PATCH] --- yaml --- r: 299270 b: refs/heads/master c: 9c5fd9e85f574d9d0361b2b878f55732290afe5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/compressed/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8f2cb1971cbf..a3805b169217 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e45860f541497d73162305d48b638d9b87e1ae3 +refs/heads/master: 9c5fd9e85f574d9d0361b2b878f55732290afe5b diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index 5f6045f1766c..dc7e8ce8e6be 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -273,7 +273,7 @@ restart: adr r0, LC0 add r0, r0, #0x100 mov r1, r6 sub r2, sp, r6 - blne atags_to_fdt + bleq atags_to_fdt ldmfd sp!, {r0-r3, ip, lr} sub sp, sp, #0x10000