Răsfoiți Sursa

[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>
Nathan Lynch 20 ani în urmă
părinte
comite
8be3de3fd8
1 a modificat fișierele cu 1 adăugiri și 1 ștergeri
  1. 1 1
      arch/ppc64/kernel/prom_init.c

+ 1 - 1
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 */
 	/* 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");