diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-03-03 00:35:40 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-03 12:01:05 +0100 |
| commit | ab1b55e21f6977e420341727e9f4a50691057b5e (patch) | |
| tree | f2b6c25bc8bd40db6b5dda217dc3c29a4ce06127 /arch | |
| parent | [PATCH] powerpc: Fix incorrect pud_ERROR() message (diff) | |
| download | linux-ab1b55e21f6977e420341727e9f4a50691057b5e.tar.xz linux-ab1b55e21f6977e420341727e9f4a50691057b5e.zip | |
[PATCH] powerpc: incorrect rmo_top handling in prom_init
On Thu, 2006-03-02 at 19:55 +0100, Olaf Hering wrote:
> My iBook1 has 2 memory regions in reg. Depending on how I boot it
> (vmlinux+initrd) or zImage.initrd, it will not boot with current Linus
> tree.
> rmo_top should be 160MB instead of 32MB.
On logically-partitioned machines the first element of the reg
property in the memory node is defined to be the "RMO" region,
i.e. the memory that the processor can access in real mode. On other
machines the first element has no special meaning, so only take it to
be the RMO region on LPAR machines.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index d34fe537400e..813c2cd194c2 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -978,7 +978,7 @@ static void __init prom_init_mem(void) if (size == 0) continue; prom_debug(" %x %x\n", base, size); - if (base == 0) + if (base == 0 && (RELOC(of_platform) & PLATFORM_LPAR)) RELOC(rmo_top) = size; if ((base + size) > RELOC(ram_top)) RELOC(ram_top) = base + size; |