diff options
| author | Nathan Lynch <ntl@pobox.com> | 2005-06-03 21:25:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-03 22:20:04 +0200 |
| commit | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (patch) | |
| tree | 1ec02e9402f82786095e58d99b1b25e95fc63c10 /arch/ppc64/kernel | |
| parent | Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6 (diff) | |
| download | linux-8be3de3fd8469154a2b3e18a4712032dac5b4a53.tar.xz linux-8be3de3fd8469154a2b3e18a4712032dac5b4a53.zip | |
[PATCH] prom_find_machine_type typo breaks pSeries lpar boot
A typo in prom_find_machine_type from Ben's recent patch "ppc64: Fix
result code handling in prom_init" prevents pSeries LPAR systems from
booting.
Tested on a pSeries 570 and OpenPower 720 (both Power5 LPAR).
Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc64/kernel')
| -rw-r--r-- | arch/ppc64/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c index 1ac531ba7056..b7683abfbe6a 100644 --- a/arch/ppc64/kernel/prom_init.c +++ b/arch/ppc64/kernel/prom_init.c @@ -1370,7 +1370,7 @@ static int __init prom_find_machine_type(void) } /* Default to pSeries. We need to know if we are running LPAR */ rtas = call_prom("finddevice", 1, 1, ADDR("/rtas")); - if (!PHANDLE_VALID(rtas)) { + if (PHANDLE_VALID(rtas)) { int x = prom_getproplen(rtas, "ibm,hypertas-functions"); if (x != PROM_ERROR) { prom_printf("Hypertas detected, assuming LPAR !\n"); |