diff options
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 6adb5a1e98bb..db540eab09f4 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/serial_8250.h> | 34 | #include <linux/serial_8250.h> |
| 35 | #include <linux/debugfs.h> | 35 | #include <linux/debugfs.h> |
| 36 | #include <linux/percpu.h> | 36 | #include <linux/percpu.h> |
| 37 | #include <linux/lmb.h> | ||
| 37 | #include <asm/io.h> | 38 | #include <asm/io.h> |
| 38 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
| 39 | #include <asm/processor.h> | 40 | #include <asm/processor.h> |
| @@ -56,7 +57,6 @@ | |||
| 56 | #include <asm/cache.h> | 57 | #include <asm/cache.h> |
| 57 | #include <asm/page.h> | 58 | #include <asm/page.h> |
| 58 | #include <asm/mmu.h> | 59 | #include <asm/mmu.h> |
| 59 | #include <asm/lmb.h> | ||
| 60 | #include <asm/xmon.h> | 60 | #include <asm/xmon.h> |
| 61 | #include <asm/cputhreads.h> | 61 | #include <asm/cputhreads.h> |
| 62 | 62 | ||
| @@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 167 | unsigned short min; | 167 | unsigned short min; |
| 168 | 168 | ||
| 169 | if (cpu_id == NR_CPUS) { | 169 | if (cpu_id == NR_CPUS) { |
| 170 | struct device_node *root; | ||
| 171 | const char *model = NULL; | ||
| 170 | #if defined(CONFIG_SMP) && defined(CONFIG_PPC32) | 172 | #if defined(CONFIG_SMP) && defined(CONFIG_PPC32) |
| 171 | unsigned long bogosum = 0; | 173 | unsigned long bogosum = 0; |
| 172 | int i; | 174 | int i; |
| @@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 178 | seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq); | 180 | seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq); |
| 179 | if (ppc_md.name) | 181 | if (ppc_md.name) |
| 180 | seq_printf(m, "platform\t: %s\n", ppc_md.name); | 182 | seq_printf(m, "platform\t: %s\n", ppc_md.name); |
| 183 | root = of_find_node_by_path("/"); | ||
| 184 | if (root) | ||
| 185 | model = of_get_property(root, "model", NULL); | ||
| 186 | if (model) | ||
| 187 | seq_printf(m, "model\t\t: %s\n", model); | ||
| 188 | of_node_put(root); | ||
| 189 | |||
| 181 | if (ppc_md.show_cpuinfo != NULL) | 190 | if (ppc_md.show_cpuinfo != NULL) |
| 182 | ppc_md.show_cpuinfo(m); | 191 | ppc_md.show_cpuinfo(m); |
| 183 | 192 | ||
