Commit 8be3de3f authored by Nathan Lynch's avatar Nathan Lynch Committed by Linus Torvalds

[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: default avatarNathan Lynch <ntl@pobox.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d8d088d2
...@@ -1370,7 +1370,7 @@ static int __init prom_find_machine_type(void) ...@@ -1370,7 +1370,7 @@ static int __init prom_find_machine_type(void)
} }
/* Default to pSeries. We need to know if we are running LPAR */ /* Default to pSeries. We need to know if we are running LPAR */
rtas = call_prom("finddevice", 1, 1, ADDR("/rtas")); rtas = call_prom("finddevice", 1, 1, ADDR("/rtas"));
if (!PHANDLE_VALID(rtas)) { if (PHANDLE_VALID(rtas)) {
int x = prom_getproplen(rtas, "ibm,hypertas-functions"); int x = prom_getproplen(rtas, "ibm,hypertas-functions");
if (x != PROM_ERROR) { if (x != PROM_ERROR) {
prom_printf("Hypertas detected, assuming LPAR !\n"); prom_printf("Hypertas detected, assuming LPAR !\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment