Commit 8be3de3f authored Jun 03, 2005 by Nathan Lynch Committed by Linus Torvalds Jun 03, 2005

[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>

parent d8d088d2

arch/ppc64/kernel/prom_init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");