patch-2.4.6 linux/arch/mips/kernel/proc.c
Next file: linux/arch/mips/kernel/process.c
Previous file: linux/arch/mips/kernel/pci-dma.c
Back to the patch index
Back to the overall index
- Lines: 97
- Date:
Mon Jul 2 13:56:40 2001
- Orig file:
v2.4.5/linux/arch/mips/kernel/proc.c
- Orig date:
Sat May 13 08:29:14 2000
diff -u --recursive --new-file v2.4.5/linux/arch/mips/kernel/proc.c linux/arch/mips/kernel/proc.c
@@ -7,12 +7,16 @@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <asm/bootinfo.h>
+#include <asm/cpu.h>
#include <asm/mipsregs.h>
#include <asm/processor.h>
#include <asm/watch.h>
unsigned long unaligned_instructions;
unsigned int vced_count, vcei_count;
+#if !defined(CONFIG_CPU_HAS_LLSC)
+unsigned long ll_ops, sc_ops;
+#endif
/*
* BUFFER is PAGE_SIZE bytes long.
@@ -35,32 +39,37 @@
const char *mach_cobalt_names[] = GROUP_COBALT_NAMES;
const char *mach_nec_ddb_names[] = GROUP_NEC_DDB_NAMES;
const char *mach_baget_names[] = GROUP_BAGET_NAMES;
+ const char *mach_cosine_names[] = GROUP_COSINE_NAMES;
+ const char *mach_galileo_names[] = GROUP_GALILEO_NAMES;
+ const char *mach_momenco_names[] = GROUP_MOMENCO_NAMES;
+ const char *mach_ite_names[] = GROUP_ITE_NAMES;
+ const char *mach_philips_names[] = GROUP_PHILIPS_NAMES;
+ const char *mach_globespan_names[] = GROUP_GLOBESPAN_NAMES;
+ const char *mach_sibyte_names[] = GROUP_SIBYTE_NAMES;
+ const char *mach_toshiba_names[] = GROUP_TOSHIBA_NAMES;
+ const char *mach_alchemy_names[] = GROUP_ALCHEMY_NAMES;
const char **mach_group_to_name[] = { mach_unknown_names,
- mach_jazz_names,
- mach_dec_names,
- mach_arc_names,
- mach_sni_rm_names,
- mach_acn_names,
- mach_sgi_names,
- mach_cobalt_names,
- mach_nec_ddb_names,
- mach_baget_names };
+ mach_jazz_names, mach_dec_names, mach_arc_names,
+ mach_sni_rm_names, mach_acn_names, mach_sgi_names,
+ mach_cobalt_names, mach_nec_ddb_names, mach_baget_names,
+ mach_cosine_names, mach_galileo_names, mach_momenco_names,
+ mach_ite_names, mach_philips_names, mach_globespan_names,
+ mach_sibyte_names, mach_toshiba_names, mach_alchemy_names};
unsigned int version = read_32bit_cp0_register(CP0_PRID);
int len;
len = sprintf(buffer, "cpu\t\t\t: MIPS\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);
+ cpu_name[mips_cpu.cputype <= CPU_LAST ?
+ mips_cpu.cputype : CPU_UNKNOWN],
+ (version >> 4) & 0x0f, version & 0x0f);
len += sprintf(buffer + len, "system type\t\t: %s %s\n",
mach_group_names[mips_machgroup],
mach_group_to_name[mips_machgroup][mips_machtype]);
len += sprintf(buffer + len, "BogoMIPS\t\t: %lu.%02lu\n",
- (loops_per_sec + 2500) / 500000,
- ((loops_per_sec + 2500) / 5000) % 100);
+ loops_per_jiffy/(500000/HZ),
+ (loops_per_jiffy/(5000/HZ)) % 100);
+
#if defined (__MIPSEB__)
len += sprintf(buffer + len, "byteorder\t\t: big endian\n");
#endif
@@ -72,17 +81,23 @@
len += sprintf(buffer + len, "wait instruction\t: %s\n",
cpu_wait ? "yes" : "no");
len += sprintf(buffer + len, "microsecond timers\t: %s\n",
- cyclecounter_available ? "yes" : "no");
+ (mips_cpu.options & MIPS_CPU_COUNTER) ? "yes" : "no");
len += sprintf(buffer + len, "extra interrupt vector\t: %s\n",
dedicated_iv_available ? "yes" : "no");
len += sprintf(buffer + len, "hardware watchpoint\t: %s\n",
watch_available ? "yes" : "no");
sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
- vce_available ? "%d" : "not available");
+ (mips_cpu.options & MIPS_CPU_VCE) ? "%d" : "not available");
len += sprintf(buffer + len, fmt, 'D', vced_count);
len += sprintf(buffer + len, fmt, 'I', vcei_count);
+#if !defined(CONFIG_CPU_HAS_LLSC)
+ len += sprintf(buffer + len, "ll emulations\t\t: %lu\n",
+ ll_ops);
+ len += sprintf(buffer + len, "sc emulations\t\t: %lu\n",
+ sc_ops);
+#endif
return len;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)