Commit d8699e65 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

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: default avatarPaul Mackerras <paulus@samba.org>
parent 971dc77b

arch/powerpc/kernel/setup_64.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

arch/powerpc/platforms/iseries/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

arch/ppc64/kernel/bpa_setup.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

arch/ppc64/kernel/pmac_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/ppc64/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}