summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pollitt <npollitt@engr.sgi.com>2000-10-26 23:43:28 +0000
committerNick Pollitt <npollitt@engr.sgi.com>2000-10-26 23:43:28 +0000
commita4799d425e063f05cee73489604c0328097cbb0c (patch)
tree6155d93b4f6b5bb5525ce75255bf212791a4e2ab
parentdd5e8b370b28b3b353de3f701a2aad875e9ee642 (diff)
Modified two things:
1) Added loop to provide per cpu info like other architectures 2) Added >4K output support
-rw-r--r--arch/mips64/kernel/proc.c57
1 files changed, 37 insertions, 20 deletions
diff --git a/arch/mips64/kernel/proc.c b/arch/mips64/kernel/proc.c
index 78a9cbdcc..766540e2c 100644
--- a/arch/mips64/kernel/proc.c
+++ b/arch/mips64/kernel/proc.c
@@ -26,50 +26,67 @@ unsigned int vced_count, vcei_count;
* Currently /proc/cpuinfo is being abused to print data about the
* number of date/instruction cacheflushes.
*/
-int get_cpuinfo(char *buffer)
+int get_cpuinfo(char *buffer, char **start, off_t offset, int count)
{
char fmt [64];
- size_t len;
+ struct cpuinfo_mips *c = cpu_data;
+ size_t len = 0;
+ int n;
- len = sprintf(buffer, "cpu\t\t\t: MIPS\n");
-#if 0
- len += sprintf(buffer + len, "cpu model\t\t: %s V%d.%d\n",
+ for (n = 0; n < smp_num_cpus; n++, c++) {
+ len += sprintf(buffer + len, "processor\t\t: %d\n", n);
+ len += sprintf(buffer + len, "vendor_id\t\t: MIPS\n");
+ len += sprintf(buffer + len, "model name\t\t: R10000\n");
+/* len += sprintf(buffer + len, "cpu model\t\t: %s V%d.%d\n",
cpu_name[mips_cputype <= CPU_LAST ?
mips_cputype :
CPU_UNKNOWN],
(version >> 4) & 0x0f,
version & 0x0f);
- len += sprintf(buffer + len, "system type\t\t: %s %s\n",
+ len += sprintf(buffer + len, "system type\t\t: %s %s\n",
mach_group_names[mips_machgroup],
mach_group_to_name[mips_machgroup][mips_machtype]);
-#endif
- len += sprintf(buffer + len, "BogoMIPS\t\t: %lu.%02lu\n",
+*/
+ len += sprintf(buffer + len, "BogoMIPS\t\t: %lu.%02lu\n",
(loops_per_sec + 2500) / 500000,
((loops_per_sec + 2500) / 5000) % 100);
- len += sprintf(buffer + len, "Number of cpus\t\t: %d\n", smp_num_cpus);
+/* len += sprintf(buffer + len, "Number of cpus\t\t: %d\n", smp_num_cpus);*/
#if defined (__MIPSEB__)
- len += sprintf(buffer + len, "byteorder\t\t: big endian\n");
+ len += sprintf(buffer + len, "byteorder\t\t: big endian\n");
#endif
#if defined (__MIPSEL__)
- len += sprintf(buffer + len, "byteorder\t\t: little endian\n");
+ len += sprintf(buffer + len, "byteorder\t\t: little endian\n");
#endif
- len += sprintf(buffer + len, "unaligned accesses\t: %lu\n",
+ len += sprintf(buffer + len, "unaligned accesses\t: %lu\n",
unaligned_instructions);
- len += sprintf(buffer + len, "wait instruction\t: %s\n",
+ len += sprintf(buffer + len, "wait instruction\t: %s\n",
wait_available ? "yes" : "no");
- len += sprintf(buffer + len, "microsecond timers\t: %s\n",
+ len += sprintf(buffer + len, "microsecond timers\t: %s\n",
cyclecounter_available ? "yes" : "no");
- len += sprintf(buffer + len, "extra interrupt vector\t: %s\n",
+ len += sprintf(buffer + len, "extra interrupt vector\t: %s\n",
dedicated_iv_available ? "yes" : "no");
- len += sprintf(buffer + len, "hardware watchpoint\t: %s\n",
+ len += sprintf(buffer + len, "hardware watchpoint\t: %s\n",
watch_available ? "yes" : "no");
- sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
+ sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
vce_available ? "%d" : "not available");
- len += sprintf(buffer + len, fmt, 'D', vced_count);
- len += sprintf(buffer + len, fmt, 'I', vcei_count);
+ len += sprintf(buffer + len, fmt, 'D', vced_count);
+ len += sprintf(buffer + len, fmt, 'I', vcei_count);
+ len += sprintf(buffer + len, "\n");
+
+ if (len < offset)
+ offset -= len, len = 0;
+ else if (len >= offset + count)
+ goto leave_loop;
+ }
+
+leave_loop:
+ *start = buffer + offset;
+ len -= offset;
+ if (len < 0)
+ len = 0;
+ return len > count ? count : len;
- return len;
}
void init_irq_proc(void)