2 files changed, 62 insertions, 58 deletions
diff --git a/arch/cris/arch-v10/kernel/setup.c b/arch/cris/arch-v10/kernel/setup.c
index 4f96d71b5154..7ab31f1c7540 100644
--- a/arch/cris/arch-v10/kernel/setup.c
+++ b/arch/cris/arch-v10/kernel/setup.c
@@ -63,35 +63,37 @@ int show_cpuinfo(struct seq_file *m, void *v)
        else
                info = &cpu_info[revision];
-        return seq_printf(m,
+        seq_printf(m,
-                       "processor\t: 0\n" 
+                   "processor\t: 0\n"
-                       "cpu\t\t: CRIS\n"
+                   "cpu\t\t: CRIS\n"
-                       "cpu revision\t: %lu\n"
+                   "cpu revision\t: %lu\n"
-                       "cpu model\t: %s\n"
+                   "cpu model\t: %s\n"
-                       "cache size\t: %d kB\n"
+                   "cache size\t: %d kB\n"
-                       "fpu\t\t: %s\n"
+                   "fpu\t\t: %s\n"
-                       "mmu\t\t: %s\n"
+                   "mmu\t\t: %s\n"
-                       "mmu DMA bug\t: %s\n"
+                   "mmu DMA bug\t: %s\n"
-                       "ethernet\t: %s Mbps\n"
+                   "ethernet\t: %s Mbps\n"
-                       "token ring\t: %s\n"
+                   "token ring\t: %s\n"
-                       "scsi\t\t: %s\n"
+                   "scsi\t\t: %s\n"
-                       "ata\t\t: %s\n"
+                   "ata\t\t: %s\n"
-                       "usb\t\t: %s\n"
+                   "usb\t\t: %s\n"
-                       "bogomips\t: %lu.%02lu\n",
+                   "bogomips\t: %lu.%02lu\n",
-                       revision,
+                   revision,
-                       info->model,
+                   info->model,
-                       info->cache,
+                   info->cache,
-                       info->flags & HAS_FPU ? "yes" : "no",
+                   info->flags & HAS_FPU ? "yes" : "no",
-                       info->flags & HAS_MMU ? "yes" : "no",
+                   info->flags & HAS_MMU ? "yes" : "no",
-                       info->flags & HAS_MMU_BUG ? "yes" : "no",
+                   info->flags & HAS_MMU_BUG ? "yes" : "no",
-                       info->flags & HAS_ETHERNET100 ? "10/100" : "10",
+                   info->flags & HAS_ETHERNET100 ? "10/100" : "10",
-                       info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
+                   info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
-                       info->flags & HAS_SCSI ? "yes" : "no",
+                   info->flags & HAS_SCSI ? "yes" : "no",
-                       info->flags & HAS_ATA ? "yes" : "no",
+                   info->flags & HAS_ATA ? "yes" : "no",
-                       info->flags & HAS_USB ? "yes" : "no",
+                   info->flags & HAS_USB ? "yes" : "no",
-                       (loops_per_jiffy * HZ + 500) / 500000,
+                   (loops_per_jiffy * HZ + 500) / 500000,
-                       ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+                   ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+        return 0;
 }
 #endif /* CONFIG_PROC_FS */
diff --git a/arch/cris/arch-v32/kernel/setup.c b/arch/cris/arch-v32/kernel/setup.c
index 61e10ae65296..81715c683baf 100644
--- a/arch/cris/arch-v32/kernel/setup.c
+++ b/arch/cris/arch-v32/kernel/setup.c
@@ -77,36 +77,38 @@ int show_cpuinfo(struct seq_file *m, void *v)
                }
        }
-        return seq_printf(m,
+        seq_printf(m,
-                "processor\t: %d\n"
+                   "processor\t: %d\n"
-                "cpu\t\t: CRIS\n"
+                   "cpu\t\t: CRIS\n"
-                "cpu revision\t: %lu\n"
+                   "cpu revision\t: %lu\n"
-                "cpu model\t: %s\n"
+                   "cpu model\t: %s\n"
-                "cache size\t: %d KB\n"
+                   "cache size\t: %d KB\n"
-                "fpu\t\t: %s\n"
+                   "fpu\t\t: %s\n"
-                "mmu\t\t: %s\n"
+                   "mmu\t\t: %s\n"
-                "mmu DMA bug\t: %s\n"
+                   "mmu DMA bug\t: %s\n"
-                "ethernet\t: %s Mbps\n"
+                   "ethernet\t: %s Mbps\n"
-                "token ring\t: %s\n"
+                   "token ring\t: %s\n"
-                "scsi\t\t: %s\n"
+                   "scsi\t\t: %s\n"
-                "ata\t\t: %s\n"
+                   "ata\t\t: %s\n"
-                "usb\t\t: %s\n"
+                   "usb\t\t: %s\n"
-                "bogomips\t: %lu.%02lu\n\n",
+                   "bogomips\t: %lu.%02lu\n\n",
-                cpu,
+                   cpu,
-                revision,
+                   revision,
-                info->cpu_model,
+                   info->cpu_model,
-                info->cache_size,
+                   info->cache_size,
-                info->flags & HAS_FPU ? "yes" : "no",
+                   info->flags & HAS_FPU ? "yes" : "no",
-                info->flags & HAS_MMU ? "yes" : "no",
+                   info->flags & HAS_MMU ? "yes" : "no",
-                info->flags & HAS_MMU_BUG ? "yes" : "no",
+                   info->flags & HAS_MMU_BUG ? "yes" : "no",
-                info->flags & HAS_ETHERNET100 ? "10/100" : "10",
+                   info->flags & HAS_ETHERNET100 ? "10/100" : "10",
-                info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
+                   info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
-                info->flags & HAS_SCSI ? "yes" : "no",
+                   info->flags & HAS_SCSI ? "yes" : "no",
-                info->flags & HAS_ATA ? "yes" : "no",
+                   info->flags & HAS_ATA ? "yes" : "no",
-                info->flags & HAS_USB ? "yes" : "no",
+                   info->flags & HAS_USB ? "yes" : "no",
-                (loops_per_jiffy * HZ + 500) / 500000,
+                   (loops_per_jiffy * HZ + 500) / 500000,
-                ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+                   ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+        return 0;
 }
 #endif /* CONFIG_PROC_FS */

diff --git a/arch/cris/arch-v10/kernel/setup.c b/arch/cris/arch-v10/kernel/setup.c index 4f96d71b5154..7ab31f1c7540 100644 --- a/arch/cris/arch-v10/kernel/setup.c +++ b/arch/cris/arch-v10/kernel/setup.c
@@ -63,35 +63,37 @@ int show_cpuinfo(struct seq_file m, void v)
63	else	63	else
64	info = &cpu_info[revision];	64	info = &cpu_info[revision];
65		65
66	return seq_printf(m,	66	seq_printf(m,
67	"processor\t: 0\n"	67	"processor\t: 0\n"
68	"cpu\t\t: CRIS\n"	68	"cpu\t\t: CRIS\n"
69	"cpu revision\t: %lu\n"	69	"cpu revision\t: %lu\n"
70	"cpu model\t: %s\n"	70	"cpu model\t: %s\n"
71	"cache size\t: %d kB\n"	71	"cache size\t: %d kB\n"
72	"fpu\t\t: %s\n"	72	"fpu\t\t: %s\n"
73	"mmu\t\t: %s\n"	73	"mmu\t\t: %s\n"
74	"mmu DMA bug\t: %s\n"	74	"mmu DMA bug\t: %s\n"
75	"ethernet\t: %s Mbps\n"	75	"ethernet\t: %s Mbps\n"
76	"token ring\t: %s\n"	76	"token ring\t: %s\n"
77	"scsi\t\t: %s\n"	77	"scsi\t\t: %s\n"
78	"ata\t\t: %s\n"	78	"ata\t\t: %s\n"
79	"usb\t\t: %s\n"	79	"usb\t\t: %s\n"
80	"bogomips\t: %lu.%02lu\n",	80	"bogomips\t: %lu.%02lu\n",
81		81
82	revision,	82	revision,
83	info->model,	83	info->model,
84	info->cache,	84	info->cache,
85	info->flags & HAS_FPU ? "yes" : "no",	85	info->flags & HAS_FPU ? "yes" : "no",
86	info->flags & HAS_MMU ? "yes" : "no",	86	info->flags & HAS_MMU ? "yes" : "no",
87	info->flags & HAS_MMU_BUG ? "yes" : "no",	87	info->flags & HAS_MMU_BUG ? "yes" : "no",
88	info->flags & HAS_ETHERNET100 ? "10/100" : "10",	88	info->flags & HAS_ETHERNET100 ? "10/100" : "10",
89	info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",	89	info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
90	info->flags & HAS_SCSI ? "yes" : "no",	90	info->flags & HAS_SCSI ? "yes" : "no",
91	info->flags & HAS_ATA ? "yes" : "no",	91	info->flags & HAS_ATA ? "yes" : "no",
92	info->flags & HAS_USB ? "yes" : "no",	92	info->flags & HAS_USB ? "yes" : "no",
93	(loops_per_jiffy * HZ + 500) / 500000,	93	(loops_per_jiffy * HZ + 500) / 500000,
94	((loops_per_jiffy * HZ + 500) / 5000) % 100);	94	((loops_per_jiffy * HZ + 500) / 5000) % 100);
		95
		96	return 0;
95	}	97	}
96		98
97	#endif /* CONFIG_PROC_FS */	99	#endif /* CONFIG_PROC_FS */


diff --git a/arch/cris/arch-v32/kernel/setup.c b/arch/cris/arch-v32/kernel/setup.c index 61e10ae65296..81715c683baf 100644 --- a/arch/cris/arch-v32/kernel/setup.c +++ b/arch/cris/arch-v32/kernel/setup.c
@@ -77,36 +77,38 @@ int show_cpuinfo(struct seq_file m, void v)
77	}	77	}
78	}	78	}
79		79
80	return seq_printf(m,	80	seq_printf(m,
81	"processor\t: %d\n"	81	"processor\t: %d\n"
82	"cpu\t\t: CRIS\n"	82	"cpu\t\t: CRIS\n"
83	"cpu revision\t: %lu\n"	83	"cpu revision\t: %lu\n"
84	"cpu model\t: %s\n"	84	"cpu model\t: %s\n"
85	"cache size\t: %d KB\n"	85	"cache size\t: %d KB\n"
86	"fpu\t\t: %s\n"	86	"fpu\t\t: %s\n"
87	"mmu\t\t: %s\n"	87	"mmu\t\t: %s\n"
88	"mmu DMA bug\t: %s\n"	88	"mmu DMA bug\t: %s\n"
89	"ethernet\t: %s Mbps\n"	89	"ethernet\t: %s Mbps\n"
90	"token ring\t: %s\n"	90	"token ring\t: %s\n"
91	"scsi\t\t: %s\n"	91	"scsi\t\t: %s\n"
92	"ata\t\t: %s\n"	92	"ata\t\t: %s\n"
93	"usb\t\t: %s\n"	93	"usb\t\t: %s\n"
94	"bogomips\t: %lu.%02lu\n\n",	94	"bogomips\t: %lu.%02lu\n\n",
95		95
96	cpu,	96	cpu,
97	revision,	97	revision,
98	info->cpu_model,	98	info->cpu_model,
99	info->cache_size,	99	info->cache_size,
100	info->flags & HAS_FPU ? "yes" : "no",	100	info->flags & HAS_FPU ? "yes" : "no",
101	info->flags & HAS_MMU ? "yes" : "no",	101	info->flags & HAS_MMU ? "yes" : "no",
102	info->flags & HAS_MMU_BUG ? "yes" : "no",	102	info->flags & HAS_MMU_BUG ? "yes" : "no",
103	info->flags & HAS_ETHERNET100 ? "10/100" : "10",	103	info->flags & HAS_ETHERNET100 ? "10/100" : "10",
104	info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",	104	info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
105	info->flags & HAS_SCSI ? "yes" : "no",	105	info->flags & HAS_SCSI ? "yes" : "no",
106	info->flags & HAS_ATA ? "yes" : "no",	106	info->flags & HAS_ATA ? "yes" : "no",
107	info->flags & HAS_USB ? "yes" : "no",	107	info->flags & HAS_USB ? "yes" : "no",
108	(loops_per_jiffy * HZ + 500) / 500000,	108	(loops_per_jiffy * HZ + 500) / 500000,
109	((loops_per_jiffy * HZ + 500) / 5000) % 100);	109	((loops_per_jiffy * HZ + 500) / 5000) % 100);
		110
		111	return 0;
110	}	112	}
111		113
112	#endif /* CONFIG_PROC_FS */	114	#endif /* CONFIG_PROC_FS */