patch-2.1.75 linux/include/asm-i386/processor.h

• Lines: 64
• Date: Sun Dec 21 17:27:18 1997
• Orig file: v2.1.74/linux/include/asm-i386/processor.h
• Orig date: Fri Dec 19 15:53:02 1997

diff -u --recursive --new-file v2.1.74/linux/include/asm-i386/processor.h linux/include/asm-i386/processor.h
@@ -12,21 +12,51 @@
 #include <asm/segment.h>
 
 /*
- * System setup and hardware bug flags..
- * [Note we don't test the 386 multiply bug or popad bug]
+ *  CPU type and hardware bug flags. Kept separately for each CPU.
+ *  Members of this structure are referenced in head.S, so think twice
+ *  before touching them. [mj]
  */
 
-extern char hard_math;
-extern char x86;		/* lower 4 bits */
-extern char x86_vendor_id[13];
-extern char x86_model;		/* lower 4 bits */
-extern char x86_mask;		/* lower 4 bits */
-extern int  x86_capability;	/* field of flags */
-extern int  fdiv_bug;		
+struct cpuinfo_x86 {
+	u8	x86;		/* CPU family */
+	u8	x86_vendor;	/* CPU vendor */
+	u8	x86_model;
+	u8	x86_mask;
+	char	wp_works_ok;	/* It doesn't on 386's */
+	char	hlt_works_ok;	/* Problems on some 486Dx4's and old 386's */
+	char	hard_math;
+	char	rfu;
+	int	cpuid_level;	/* Maximum supported CPUID level, -1=no CPUID */
+	u32	x86_capability;
+	char	x86_vendor_id[16];
+	char	x86_model_id[64];
+	int	fdiv_bug;
+	int	f00f_bug;
+	unsigned long loops_per_sec;
+};
+
+#define X86_VENDOR_INTEL 0
+#define X86_VENDOR_CYRIX 1
+#define X86_VENDOR_AMD 2
+#define X86_VENDOR_UMC 3
+#define X86_VENDOR_NEXGEN 4
+#define X86_VENDOR_CENTAUR 5
+#define X86_VENDOR_UNKNOWN 0xff
+
+extern struct cpuinfo_x86 boot_cpu_data;
+
+#ifdef __SMP__
+extern struct cpuinfo_x86 cpu_data[];
+#define current_cpu_data cpu_data[smp_processor_id()]
+#else
+#define cpu_data &boot_cpu_data
+#define current_cpu_data boot_cpu_data
+#endif
+
 extern char ignore_irq13;
-extern char wp_works_ok;	/* doesn't work on a 386 */
-extern char hlt_works_ok;	/* problems on some 486Dx4's and old 386's */
-extern int  have_cpuid;		/* We have a CPUID */
+
+extern void identify_cpu(struct cpuinfo_x86 *);
+extern void print_cpu_info(struct cpuinfo_x86 *);
 
 /*
  * Bus types (default is ISA, but people can check others with these..)