From 9de4ebe0b2ac5f4113d73df2d561789d23d5ef76 Mon Sep 17 00:00:00 2001 From: Marian Balakowicz Date: Sat, 10 Nov 2007 04:11:43 +1100 Subject: [PATCH] --- yaml --- r: 91435 b: refs/heads/master c: 0276c1368f111b1fd75e6fe0bf4cd78a6903798f h: refs/heads/master i: 91433: 7c6c2b2da6818d7166f5e7985038ec580207edec 91431: 0ba4e3ae4a3026b06a7604568f21dab407aede04 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/setup-common.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0160c844cf5c..8c8a25560b51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bed04a4413376265746053be2a9cfbfc80c98ec9 +refs/heads/master: 0276c1368f111b1fd75e6fe0bf4cd78a6903798f diff --git a/trunk/arch/powerpc/kernel/setup-common.c b/trunk/arch/powerpc/kernel/setup-common.c index 12cc41c16b0d..db540eab09f4 100644 --- a/trunk/arch/powerpc/kernel/setup-common.c +++ b/trunk/arch/powerpc/kernel/setup-common.c @@ -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);