rename bluesmoke to machine_check

10 files changed, 17 insertions, 17 deletions

diff --git a/AMD/AMD.h b/AMD/AMD.h
index b37822e..8d1bef1 100644
--- a/AMD/AMD.h
+++ b/AMD/AMD.h
@@ -8,7 +8,7 @@
 
 #ifndef _AMD_H
 #define _AMD_H
-extern void decode_athlon_bluesmoke(int cpunum);
+extern void decode_athlon_machine_check(int cpunum);
 extern void dump_athlon_MSR(struct cpudata *cpu);
 extern void dump_k6_MSR (struct cpudata *cpu);
 extern void decode_powernow (struct cpudata *cpu);
diff --git a/AMD/identify.c b/AMD/identify.c
index b83d2d3..5d9f897 100644
--- a/AMD/identify.c
+++ b/AMD/identify.c
@@ -732,8 +732,8 @@ void display_AMD_info(struct cpudata *cpu)
 			dump_athlon_MSR(cpu);
 	}
 
-	if (show_bluesmoke)
-		decode_athlon_bluesmoke(cpu->number);
+	if (show_machine_check)
+		decode_athlon_machine_check(cpu->number);
 
 	if (show_microcode && family(cpu) >= 0xf)
 		show_patch_level(cpu);
diff --git a/AMD/bluesmoke.c b/AMD/machine_check.c
index 1d04f86..64866a0 100644
--- a/AMD/bluesmoke.c
+++ b/AMD/machine_check.c
@@ -21,7 +21,7 @@
 #define MC_ADDR 0x402
 #define MC_MISC 0x403
 
-void decode_athlon_bluesmoke(int cpunum)
+void decode_athlon_machine_check(int cpunum)
 {
 	unsigned long long val, val2;
 	unsigned int banks, i, ctlp = 0;
diff --git a/Intel/Intel.h b/Intel/Intel.h
index a31078a..bb6d71b 100644
--- a/Intel/Intel.h
+++ b/Intel/Intel.h
@@ -2,7 +2,7 @@
 #define _INTEL_H
 extern void decode_Intel_caches (struct cpudata *cpu, int output);
 extern void show_Intel_caches(struct cpudata *cpu);
-extern void decode_Intel_bluesmoke(int cpunum, int family);
+extern void decode_Intel_machine_check(int cpunum, int family);
 extern void dump_p4_MSRs(struct cpudata *cpu);
 extern void dump_p6_MSRs(struct cpudata *cpu);
 extern void dump_performance_MSRs(struct cpudata *cpu);
diff --git a/Intel/info.c b/Intel/info.c
index b414059..3a9746f 100644
--- a/Intel/info.c
+++ b/Intel/info.c
@@ -134,8 +134,8 @@ void display_Intel_info(struct cpudata *cpu)
 	}
 
 	/* FIXME: Bit test for MCA here!*/
-	if (show_bluesmoke)
-		decode_Intel_bluesmoke(cpu->number, cpu->family);
+	if (show_machine_check)
+		decode_Intel_machine_check(cpu->number, cpu->family);
 
 	if (show_microcode)
 		decode_microcode(cpu);
diff --git a/Intel/bluesmoke.c b/Intel/machine_check.c
index eb55677..89af8c7 100644
--- a/Intel/bluesmoke.c
+++ b/Intel/machine_check.c
@@ -86,7 +86,7 @@ static void decode_mcg_ctl(int cpunum)
 }
 
 
-void decode_Intel_bluesmoke(int cpunum, int family)
+void decode_Intel_machine_check(int cpunum, int family)
 {
 	unsigned long long val;
 	int i, extcount = 0;
diff --git a/Makefile b/Makefile
index 4a3d1df..0afb094 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ lsmsr: $(LSMSR_TMP_HEADERS) $(LSMSR_OBJS)
 
 X86INFO_SRC =\
 	AMD/identify.c\
-	AMD/bluesmoke.c\
+	AMD/machine_check.c\
 	AMD/MSR-Athlon.c\
 	AMD/MSR-K6.c\
 	AMD/powernow.c\
@@ -55,7 +55,7 @@ X86INFO_SRC =\
 	Intel/identify-family6-extended.c\
 	Intel/identify-family15.c\
 	Intel/info.c\
-	Intel/bluesmoke.c\
+	Intel/machine_check.c\
 	Intel/cachesize.c\
 	Intel/eblcr.c\
 	Intel/MSR-P4.c\
diff --git a/x86info.1 b/x86info.1
index 35594ea..2d1cf2d 100644
--- a/x86info.1
+++ b/x86info.1
@@ -92,7 +92,7 @@ Estimate current clock rate.
 Dump MP table showing CPUs BIOS knows about.
 .IP "\fB-r\fP           \fB--registers\fP         " 10 
 Show register values from all possible cpuid calls. 
-.IP "\fB-s\fP           \fB--show-bluesmoke\fP         " 10 
+.IP "\fB-s\fP           \fB--show-machine-check\fP         " 10 
 Show machine check exception information.
 .IP "\fB-v\fP           \fB--verbose\fP         " 10 
 Show verbose descriptions.
diff --git a/x86info.c b/x86info.c
index 45de42d..e7078ac 100644
--- a/x86info.c
+++ b/x86info.c
@@ -17,7 +17,7 @@
 int show_apic=0;
 int show_bench=0;
 int show_bios=0;
-int show_bluesmoke=0;
+int show_machine_check=0;
 int show_bugs=0;
 int show_cacheinfo=0;
 int show_connector=0;
@@ -63,6 +63,7 @@ static void usage (char *programname)
       --connector\n\
       --debug\n\
 -f,   --flags\n\
+-mce, --show-machine-check\n\
 -mhz, --mhz\n\
       --microcode\n\
 -mp,  --mptable\n\
@@ -71,7 +72,6 @@ static void usage (char *programname)
       --mtrr\n\
       --pm\n\
 -r,   --registers\n\
--s,   --show-bluesmoke\n\
 -u,   --urls\n\
 -v,   --verbose\n\
 \n", programname);
@@ -93,7 +93,7 @@ static void parse_command_line (int argc, char **argv)
 				need_root = 1;
 				show_mptable =1;
 				show_mtrr = 1;
-				show_bluesmoke = 1;
+				show_machine_check = 1;
 				show_eblcr =1;
 			}
 			show_addr_sizes = 1;
@@ -175,9 +175,9 @@ static void parse_command_line (int argc, char **argv)
 		if ((!strcmp(arg, "-r") || !strcmp(arg, "--registers")))
 			show_registers = 1;
 
-		if ((!strcmp(arg, "-s") || !strcmp(arg, "--show-bluesmoke"))) {
+		if ((!strcmp(arg, "-mce") || !strcmp(arg, "--show-machine-check"))) {
 			need_root = 1;
-			show_bluesmoke = 1;
+			show_machine_check = 1;
 		}
 
 		if ((!strcmp(arg, "-u") || !strcmp(arg, "--urls")))
diff --git a/x86info.h b/x86info.h
index 56721ec..f75e1cc 100644
--- a/x86info.h
+++ b/x86info.h
@@ -175,7 +175,7 @@ void decode_AMD_cacheinfo(struct cpudata *cpu);
 
 extern int show_bench;
 extern int show_bios;
-extern int show_bluesmoke;
+extern int show_machine_check;
 extern int show_bugs;
 extern int show_cacheinfo;
 extern int show_connector;