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

Commit 0276c136 authored by Marian Balakowicz's avatar Marian Balakowicz Committed by Paul Mackerras
Browse files

[POWERPC] Add 'model: ...' line to common show_cpuinfo() 



Print out 'model' property of '/' node as a machine name
in generic show_cpuinfo() routine.

Signed-off-by: default avatarMarian Balakowicz <m8@semihalf.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent bed04a44

arch/powerpc/kernel/setup-common.c

+9 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	unsigned short min;



	if (cpu_id == NR_CPUS) {

		struct device_node *root;

		const char *model = NULL;

#if defined(CONFIG_SMP) && defined(CONFIG_PPC32)

		unsigned long bogosum = 0;

		int i;
@@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);

		if (ppc_md.name)

			seq_printf(m, "platform\t: %s\n", ppc_md.name);

		root = of_find_node_by_path("/");

		if (root)

			model = of_get_property(root, "model", NULL);

		if (model)

			seq_printf(m, "model\t\t: %s\n", model);

		of_node_put(root);



		if (ppc_md.show_cpuinfo != NULL)

			ppc_md.show_cpuinfo(m);