lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Fix places where ppc_md.show_[per]cpuinfo was treated as int

Browse Source 
I missed a few places where ppc code was still assuming that the
ppc_md.show_[per]cpuinfo functions returned int.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
2005-10-20 20:48:19 +10:00
parent a9c5926469
commit 0dd194d02d
3 changed files with 26 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/kernel/setup_32.c
View File

@@ -150,7 +150,6 @@ extern u32 cpu_temp_both(unsigned long cpu);
int show_cpuinfo(struct seq_file *m, void *v)
{
int i = (int) v - 1;
int err = 0;
unsigned int pvr;
unsigned short maj, min;
unsigned long lpj;
@@ -167,8 +166,8 @@ int show_cpuinfo(struct seq_file *m, void *v)
#endif /* CONFIG_SMP */
if (ppc_md.show_cpuinfo != NULL)
err = ppc_md.show_cpuinfo(m);
return err;
ppc_md.show_cpuinfo(m);
return 0;
}
#ifdef CONFIG_SMP
@@ -210,15 +209,12 @@ int show_cpuinfo(struct seq_file *m, void *v)
}
#endif /* CONFIG_TAU */
if (ppc_md.show_percpuinfo != NULL) {
err = ppc_md.show_percpuinfo(m, i);
if (err)
return err;
}
if (ppc_md.show_percpuinfo != NULL)
ppc_md.show_percpuinfo(m, i);
/* If we are a Freescale core do a simple check so
* we dont have to keep adding cases in the future */
if ((PVR_VER(pvr) & 0x8000) == 0x8000) {
if (PVR_VER(pvr) & 0x8000) {
maj = PVR_MAJ(pvr);
min = PVR_MIN(pvr);
} else {