]> err.no Git - linux-2.6/commitdiff
[POWERPC] Fix zImage decompress location
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 5 Oct 2006 04:18:46 +0000 (14:18 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 6 Oct 2006 11:10:41 +0000 (21:10 +1000)
The zImage wrapper has a "hack" that force the decompression to happen
above 20Mb for 64 bits kernels, to work around issues with some
firmwares on the field. However, the new wrapper has a bug which makes
that hack not work properly. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/boot/of.c

index fd99f789a37bbdd32a1507cca72191ef5e1f37af..3a71845afc6c584670075fbc9a152febcf7819de 100644 (file)
@@ -176,12 +176,9 @@ static void *claim(unsigned long virt, unsigned long size, unsigned long align)
 static void *of_try_claim(u32 size)
 {
        unsigned long addr = 0;
-       static u8 first_time = 1;
 
-       if (first_time) {
+       if (claim_base == 0)
                claim_base = _ALIGN_UP((unsigned long)_end, ONE_MB);
-               first_time = 0;
-       }
 
        for(; claim_base < RAM_END; claim_base += ONE_MB) {
 #ifdef DEBUG