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>

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6f29614c3581aabaa3d558284ccf48048c8291ac..97ffdcf09c03597c4e7d78cf760f7e3d81b5f913 100644 (file)
--- 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 41cd5b689545590a0b453b8a2db259d2bd4904bd..b279014817824601e171cd3d9df9a7a152e0e625 100644 (file)
--- 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,

diff --git a/arch/ppc64/kernel/bpa_setup.c b/arch/ppc64/kernel/bpa_setup.c
index 017cf23e91fa859781fad22b045873686527c7f6..c2dc8f282eb85680a15de253e1ad95ff5f8b41e1 100644 (file)
--- a/arch/ppc64/kernel/bpa_setup.c
+++ b/arch/ppc64/kernel/bpa_setup.c
@@ -55,7 +55,7 @@
 #define DBG(fmt...)
 #endif
 
-void bpa_get_cpuinfo(struct seq_file *m)
+void bpa_show_cpuinfo(struct seq_file *m)
 {
        struct device_node *root;
        const char *model = "";
@@ -129,7 +129,7 @@ struct machdep_calls __initdata bpa_md = {
        .probe                  = bpa_probe,
        .setup_arch             = bpa_setup_arch,
        .init_early             = bpa_init_early,
-       .get_cpuinfo            = bpa_get_cpuinfo,
+       .show_cpuinfo           = bpa_show_cpuinfo,
        .restart                = rtas_restart,
        .power_off              = rtas_power_off,
        .halt                   = rtas_halt,

diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index be4c1693d14924b273bfffb6b75cb421af2e2f4a..c059805d8ccef59adc19ec0c09882711305abc2e 100644 (file)
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
@@ -505,7 +505,7 @@ struct machdep_calls __initdata pmac_md = {
        .probe                  = pmac_probe,
        .setup_arch             = pmac_setup_arch,
        .init_early             = pmac_init_early,
-               .get_cpuinfo            = pmac_show_cpuinfo,
+               .show_cpuinfo           = pmac_show_cpuinfo,
        .init_IRQ               = pmac_init_IRQ,
        .get_irq                = mpic_get_irq,
        .pcibios_fixup          = pmac_pcibios_fixup,

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index 3e6c1547b718ecb968b4a049c60f7d55a7649da0..42019be0c6add9641ffcf06d7afe224df0a47f67 100644 (file)
--- 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)
        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/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index f060553b997a924f79352a1cdeb7958a9609a795..8a0969b6243c0845b64b3fda6505fa6096357764 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -86,7 +86,8 @@ struct machdep_calls {
        void            (*setup_arch)(void);
        void            (*init_early)(void);
        /* Optional, may be NULL. */
-       void            (*get_cpuinfo)(struct seq_file *m);
+       void            (*show_cpuinfo)(struct seq_file *m);
+       void            (*show_percpuinfo)(struct seq_file *m, int i);
 
        void            (*init_IRQ)(void);
        int             (*get_irq)(struct pt_regs *);
@@ -153,10 +154,6 @@ struct machdep_calls {
        void            (*enable_pmcs)(void);
 
 #ifdef CONFIG_PPC32    /* XXX for now */
-       /* Optional, may be NULL. */
-       int             (*show_cpuinfo)(struct seq_file *m);
-       int             (*show_percpuinfo)(struct seq_file *m, int i);
-       
        /* A general init function, called by ppc_init in init/main.c.
           May be NULL. */
        void            (*init)(void);