aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-20 17:02:01 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-20 17:02:01 +1000
commitd8699e65c6bc0a81b5e679ca5b135bfe3c3fb483 (patch)
treeba80488ff6b5b7e15c999233fe798332fa979430 /arch/powerpc
parent971dc77b64db9466f5caab56019e62a93c0ddfc5 (diff)
downloadlinux-linaro-stable-d8699e65c6bc0a81b5e679ca5b135bfe3c3fb483.tar.gz
ppc64: Change ppc_md.get_cpuinfo to ppc_md.show_cpuinfo
... for consistency with ppc32; also add in ppc32's show_percpuinfo function. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/setup_64.c4
-rw-r--r--arch/powerpc/platforms/iseries/setup.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6f29614c3581..97ffdcf09c03 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -704,8 +704,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
if (cpu_id == NR_CPUS) {
seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
- if (ppc_md.get_cpuinfo != NULL)
- ppc_md.get_cpuinfo(m);
+ if (ppc_md.show_cpuinfo != NULL)
+ ppc_md.show_cpuinfo(m);
return 0;
}
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 41cd5b689545..b27901481782 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -587,7 +587,7 @@ static void __init iSeries_setup_arch(void)
printk("Processor version = %x\n", systemcfg->processor);
}
-static void iSeries_get_cpuinfo(struct seq_file *m)
+static void iSeries_show_cpuinfo(struct seq_file *m)
{
seq_printf(m, "machine\t\t: 64-bit iSeries Logical Partition\n");
}
@@ -760,7 +760,7 @@ static int __init iseries_probe(int platform)
struct machdep_calls __initdata iseries_md = {
.setup_arch = iSeries_setup_arch,
- .get_cpuinfo = iSeries_get_cpuinfo,
+ .show_cpuinfo = iSeries_show_cpuinfo,
.init_IRQ = iSeries_init_IRQ,
.get_irq = iSeries_get_irq,
.init_early = iSeries_init_early,