Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1350843c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[PATCH] ppc64: Fix G5 model in /proc/cpuinfo 



Andreas Schwab spotted that recent kernels broke reporting of the PowerMac
machine model in /proc/cpuinfo.  This fixes it.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a90933fb

arch/ppc64/kernel/pmac_setup.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void __pmac pmac_show_cpuinfo(struct seq_file *m) 
	

	/* find motherboard type */

	seq_printf(m, "machine\t\t: ");

	np = find_devices("device-tree");

	np = of_find_node_by_path("/");

	if (np != NULL) {

		pp = (char *) get_property(np, "model", NULL);

		if (pp != NULL)
@@ -133,6 +133,7 @@ static void __pmac pmac_show_cpuinfo(struct seq_file *m) 
			}

			seq_printf(m, "\n");

		}

		of_node_put(np);

	} else

		seq_printf(m, "PowerMac\n");