diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/powerpc/kernel/prom_init.c | |
| parent | 9585da3729e7e27bf22818625c10ac6c64ebb609 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -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) | |||
| 978 | if (size == 0) | 978 | if (size == 0) |
| 979 | continue; | 979 | continue; |
| 980 | prom_debug(" %x %x\n", base, size); | 980 | prom_debug(" %x %x\n", base, size); |
| 981 | if (base == 0) | 981 | if (base == 0 && (RELOC(of_platform) & PLATFORM_LPAR)) |
| 982 | RELOC(rmo_top) = size; | 982 | RELOC(rmo_top) = size; |
| 983 | if ((base + size) > RELOC(ram_top)) | 983 | if ((base + size) > RELOC(ram_top)) |
| 984 | RELOC(ram_top) = base + size; | 984 | RELOC(ram_top) = base + size; |