summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-10-05 14:18:46 +1000
committerPaul Mackerras <paulus@samba.org>2006-10-06 21:10:41 +1000
commitc998de146061db17787c1a31a3db1989f1341fdf (patch)
tree65ca1488ea5ad8af8b19366d2fbbe73597323bb9 /arch/powerpc/boot
parent9938c474f39e416091db9993954996266a3f2edf (diff)
downloadblackbird-op-linux-c998de146061db17787c1a31a3db1989f1341fdf.tar.gz
blackbird-op-linux-c998de146061db17787c1a31a3db1989f1341fdf.zip
[POWERPC] Fix zImage decompress location
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>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/of.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index fd99f789a37b..3a71845afc6c 100644
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -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
OpenPOWER on IntegriCloud