aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/x86/kernel/cpu/mcheck/k7.c18
-rw-r--r--arch/x86/kernel/cpu/mcheck/p4.c18
-rw-r--r--arch/x86/kernel/cpu/mcheck/p6.c16
3 files changed, 26 insertions, 26 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/k7.c b/arch/x86/kernel/cpu/mcheck/k7.c
index 9e929409fd7a..55dfd4f9446a 100644
--- a/arch/x86/kernel/cpu/mcheck/k7.c
+++ b/arch/x86/kernel/cpu/mcheck/k7.c
@@ -27,11 +27,11 @@ static void k7_machine_check(struct pt_regs * regs, long error_code)
27 if (mcgstl & (1<<0)) /* Recoverable ? */ 27 if (mcgstl & (1<<0)) /* Recoverable ? */
28 recover=0; 28 recover=0;
29 29
30 printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", 30 printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
31 smp_processor_id(), mcgsth, mcgstl); 31 smp_processor_id(), mcgsth, mcgstl);
32 32
33 for (i=1; i<nr_mce_banks; i++) { 33 for (i = 1; i < nr_mce_banks; i++) {
34 rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high); 34 rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high);
35 if (high&(1<<31)) { 35 if (high&(1<<31)) {
36 char misc[20]; 36 char misc[20];
37 char addr[24]; 37 char addr[24];
@@ -42,17 +42,17 @@ static void k7_machine_check(struct pt_regs * regs, long error_code)
42 recover |= 2; 42 recover |= 2;
43 high &= ~(1<<31); 43 high &= ~(1<<31);
44 if (high & (1<<27)) { 44 if (high & (1<<27)) {
45 rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh); 45 rdmsr(MSR_IA32_MC0_MISC+i*4, alow, ahigh);
46 snprintf (misc, 20, "[%08x%08x]", ahigh, alow); 46 snprintf(misc, 20, "[%08x%08x]", ahigh, alow);
47 } 47 }
48 if (high & (1<<26)) { 48 if (high & (1<<26)) {
49 rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh); 49 rdmsr(MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
50 snprintf (addr, 24, " at %08x%08x", ahigh, alow); 50 snprintf(addr, 24, " at %08x%08x", ahigh, alow);
51 } 51 }
52 printk (KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n", 52 printk(KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
53 smp_processor_id(), i, high, low, misc, addr); 53 smp_processor_id(), i, high, low, misc, addr);
54 /* Clear it */ 54 /* Clear it */
55 wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL); 55 wrmsr(MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
56 /* Serialize */ 56 /* Serialize */
57 wmb(); 57 wmb();
58 add_taint(TAINT_MACHINE_CHECK); 58 add_taint(TAINT_MACHINE_CHECK);
diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c
index cb03a1b50504..77463a3e9adf 100644
--- a/arch/x86/kernel/cpu/mcheck/p4.c
+++ b/arch/x86/kernel/cpu/mcheck/p4.c
@@ -152,13 +152,13 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
152 if (mcgstl & (1<<0)) /* Recoverable ? */ 152 if (mcgstl & (1<<0)) /* Recoverable ? */
153 recover=0; 153 recover=0;
154 154
155 printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", 155 printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
156 smp_processor_id(), mcgsth, mcgstl); 156 smp_processor_id(), mcgsth, mcgstl);
157 157
158 if (mce_num_extended_msrs > 0) { 158 if (mce_num_extended_msrs > 0) {
159 struct intel_mce_extended_msrs dbg; 159 struct intel_mce_extended_msrs dbg;
160 intel_get_extended_msrs(&dbg); 160 intel_get_extended_msrs(&dbg);
161 printk (KERN_DEBUG "CPU %d: EIP: %08x EFLAGS: %08x\n" 161 printk(KERN_DEBUG "CPU %d: EIP: %08x EFLAGS: %08x\n"
162 "\teax: %08x ebx: %08x ecx: %08x edx: %08x\n" 162 "\teax: %08x ebx: %08x ecx: %08x edx: %08x\n"
163 "\tesi: %08x edi: %08x ebp: %08x esp: %08x\n", 163 "\tesi: %08x edi: %08x ebp: %08x esp: %08x\n",
164 smp_processor_id(), dbg.eip, dbg.eflags, 164 smp_processor_id(), dbg.eip, dbg.eflags,
@@ -166,8 +166,8 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
166 dbg.esi, dbg.edi, dbg.ebp, dbg.esp); 166 dbg.esi, dbg.edi, dbg.ebp, dbg.esp);
167 } 167 }
168 168
169 for (i=0; i<nr_mce_banks; i++) { 169 for (i = 0; i < nr_mce_banks; i++) {
170 rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high); 170 rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high);
171 if (high & (1<<31)) { 171 if (high & (1<<31)) {
172 char misc[20]; 172 char misc[20];
173 char addr[24]; 173 char addr[24];
@@ -178,14 +178,14 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
178 recover |= 2; 178 recover |= 2;
179 high &= ~(1<<31); 179 high &= ~(1<<31);
180 if (high & (1<<27)) { 180 if (high & (1<<27)) {
181 rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh); 181 rdmsr(MSR_IA32_MC0_MISC+i*4, alow, ahigh);
182 snprintf (misc, 20, "[%08x%08x]", ahigh, alow); 182 snprintf(misc, 20, "[%08x%08x]", ahigh, alow);
183 } 183 }
184 if (high & (1<<26)) { 184 if (high & (1<<26)) {
185 rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh); 185 rdmsr(MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
186 snprintf (addr, 24, " at %08x%08x", ahigh, alow); 186 snprintf(addr, 24, " at %08x%08x", ahigh, alow);
187 } 187 }
188 printk (KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n", 188 printk(KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
189 smp_processor_id(), i, high, low, misc, addr); 189 smp_processor_id(), i, high, low, misc, addr);
190 } 190 }
191 } 191 }
diff --git a/arch/x86/kernel/cpu/mcheck/p6.c b/arch/x86/kernel/cpu/mcheck/p6.c
index b61f3038c4c8..20376a2c0cf8 100644
--- a/arch/x86/kernel/cpu/mcheck/p6.c
+++ b/arch/x86/kernel/cpu/mcheck/p6.c
@@ -27,11 +27,11 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
27 if (mcgstl & (1<<0)) /* Recoverable ? */ 27 if (mcgstl & (1<<0)) /* Recoverable ? */
28 recover=0; 28 recover=0;
29 29
30 printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", 30 printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
31 smp_processor_id(), mcgsth, mcgstl); 31 smp_processor_id(), mcgsth, mcgstl);
32 32
33 for (i=0; i<nr_mce_banks; i++) { 33 for (i = 0; i < nr_mce_banks; i++) {
34 rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high); 34 rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high);
35 if (high & (1<<31)) { 35 if (high & (1<<31)) {
36 char misc[20]; 36 char misc[20];
37 char addr[24]; 37 char addr[24];
@@ -42,14 +42,14 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
42 recover |= 2; 42 recover |= 2;
43 high &= ~(1<<31); 43 high &= ~(1<<31);
44 if (high & (1<<27)) { 44 if (high & (1<<27)) {
45 rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh); 45 rdmsr(MSR_IA32_MC0_MISC+i*4, alow, ahigh);
46 snprintf (misc, 20, "[%08x%08x]", ahigh, alow); 46 snprintf(misc, 20, "[%08x%08x]", ahigh, alow);
47 } 47 }
48 if (high & (1<<26)) { 48 if (high & (1<<26)) {
49 rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh); 49 rdmsr(MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
50 snprintf (addr, 24, " at %08x%08x", ahigh, alow); 50 snprintf(addr, 24, " at %08x%08x", ahigh, alow);
51 } 51 }
52 printk (KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n", 52 printk(KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
53 smp_processor_id(), i, high, low, misc, addr); 53 smp_processor_id(), i, high, low, misc, addr);
54 } 54 }
55 } 55 }
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-12 19:55:10 -0500