diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-20 03:02:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-20 03:02:01 -0400 |
commit | d8699e65c6bc0a81b5e679ca5b135bfe3c3fb483 (patch) | |
tree | ba80488ff6b5b7e15c999233fe798332fa979430 /arch/ppc64 | |
parent | 971dc77b64db9466f5caab56019e62a93c0ddfc5 (diff) |
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/ppc64')
-rw-r--r-- | arch/ppc64/kernel/bpa_setup.c | 4 | ||||
-rw-r--r-- | arch/ppc64/kernel/pmac_setup.c | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/setup.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc64/kernel/bpa_setup.c b/arch/ppc64/kernel/bpa_setup.c index 017cf23e91fa..c2dc8f282eb8 100644 --- a/arch/ppc64/kernel/bpa_setup.c +++ b/arch/ppc64/kernel/bpa_setup.c | |||
@@ -55,7 +55,7 @@ | |||
55 | #define DBG(fmt...) | 55 | #define DBG(fmt...) |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | void bpa_get_cpuinfo(struct seq_file *m) | 58 | void bpa_show_cpuinfo(struct seq_file *m) |
59 | { | 59 | { |
60 | struct device_node *root; | 60 | struct device_node *root; |
61 | const char *model = ""; | 61 | const char *model = ""; |
@@ -129,7 +129,7 @@ struct machdep_calls __initdata bpa_md = { | |||
129 | .probe = bpa_probe, | 129 | .probe = bpa_probe, |
130 | .setup_arch = bpa_setup_arch, | 130 | .setup_arch = bpa_setup_arch, |
131 | .init_early = bpa_init_early, | 131 | .init_early = bpa_init_early, |
132 | .get_cpuinfo = bpa_get_cpuinfo, | 132 | .show_cpuinfo = bpa_show_cpuinfo, |
133 | .restart = rtas_restart, | 133 | .restart = rtas_restart, |
134 | .power_off = rtas_power_off, | 134 | .power_off = rtas_power_off, |
135 | .halt = rtas_halt, | 135 | .halt = rtas_halt, |
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c index be4c1693d149..c059805d8cce 100644 --- a/arch/ppc64/kernel/pmac_setup.c +++ b/arch/ppc64/kernel/pmac_setup.c | |||
@@ -505,7 +505,7 @@ struct machdep_calls __initdata pmac_md = { | |||
505 | .probe = pmac_probe, | 505 | .probe = pmac_probe, |
506 | .setup_arch = pmac_setup_arch, | 506 | .setup_arch = pmac_setup_arch, |
507 | .init_early = pmac_init_early, | 507 | .init_early = pmac_init_early, |
508 | .get_cpuinfo = pmac_show_cpuinfo, | 508 | .show_cpuinfo = pmac_show_cpuinfo, |
509 | .init_IRQ = pmac_init_IRQ, | 509 | .init_IRQ = pmac_init_IRQ, |
510 | .get_irq = mpic_get_irq, | 510 | .get_irq = mpic_get_irq, |
511 | .pcibios_fixup = pmac_pcibios_fixup, | 511 | .pcibios_fixup = pmac_pcibios_fixup, |
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index 3e6c1547b718..42019be0c6ad 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c | |||
@@ -703,8 +703,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
703 | if (cpu_id == NR_CPUS) { | 703 | if (cpu_id == NR_CPUS) { |
704 | seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq); | 704 | seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq); |
705 | 705 | ||
706 | if (ppc_md.get_cpuinfo != NULL) | 706 | if (ppc_md.show_cpuinfo != NULL) |
707 | ppc_md.get_cpuinfo(m); | 707 | ppc_md.show_cpuinfo(m); |
708 | 708 | ||
709 | return 0; | 709 | return 0; |
710 | } | 710 | } |