Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 80112
b: refs/heads/master
c: b912a1c
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Ingo Molnar committed Jan 30, 2008
1 parent 30909e3 commit e56399d
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9e8b6d90ac973939c4605236d140ae64d459622b
refs/heads/master: b912a1c73739b6016ced049552392a148c1736c8
18 changes: 9 additions & 9 deletions trunk/arch/x86/kernel/cpu/mcheck/k7.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ static void k7_machine_check(struct pt_regs * regs, long error_code)
if (mcgstl & (1<<0)) /* Recoverable ? */
recover=0;

printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
smp_processor_id(), mcgsth, mcgstl);

for (i=1; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
for (i = 1; i < nr_mce_banks; i++) {
rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high);
if (high&(1<<31)) {
char misc[20];
char addr[24];
Expand All @@ -42,17 +42,17 @@ static void k7_machine_check(struct pt_regs * regs, long error_code)
recover |= 2;
high &= ~(1<<31);
if (high & (1<<27)) {
rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
snprintf (misc, 20, "[%08x%08x]", ahigh, alow);
rdmsr(MSR_IA32_MC0_MISC+i*4, alow, ahigh);
snprintf(misc, 20, "[%08x%08x]", ahigh, alow);
}
if (high & (1<<26)) {
rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
snprintf (addr, 24, " at %08x%08x", ahigh, alow);
rdmsr(MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
snprintf(addr, 24, " at %08x%08x", ahigh, alow);
}
printk (KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
printk(KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
smp_processor_id(), i, high, low, misc, addr);
/* Clear it */
wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
wrmsr(MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
/* Serialize */
wmb();
add_taint(TAINT_MACHINE_CHECK);
Expand Down
18 changes: 9 additions & 9 deletions trunk/arch/x86/kernel/cpu/mcheck/p4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,22 +152,22 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
if (mcgstl & (1<<0)) /* Recoverable ? */
recover=0;

printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
smp_processor_id(), mcgsth, mcgstl);

if (mce_num_extended_msrs > 0) {
struct intel_mce_extended_msrs dbg;
intel_get_extended_msrs(&dbg);
printk (KERN_DEBUG "CPU %d: EIP: %08x EFLAGS: %08x\n"
printk(KERN_DEBUG "CPU %d: EIP: %08x EFLAGS: %08x\n"
"\teax: %08x ebx: %08x ecx: %08x edx: %08x\n"
"\tesi: %08x edi: %08x ebp: %08x esp: %08x\n",
smp_processor_id(), dbg.eip, dbg.eflags,
dbg.eax, dbg.ebx, dbg.ecx, dbg.edx,
dbg.esi, dbg.edi, dbg.ebp, dbg.esp);
}

for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
for (i = 0; i < nr_mce_banks; i++) {
rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high);
if (high & (1<<31)) {
char misc[20];
char addr[24];
Expand All @@ -178,14 +178,14 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
recover |= 2;
high &= ~(1<<31);
if (high & (1<<27)) {
rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
snprintf (misc, 20, "[%08x%08x]", ahigh, alow);
rdmsr(MSR_IA32_MC0_MISC+i*4, alow, ahigh);
snprintf(misc, 20, "[%08x%08x]", ahigh, alow);
}
if (high & (1<<26)) {
rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
snprintf (addr, 24, " at %08x%08x", ahigh, alow);
rdmsr(MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
snprintf(addr, 24, " at %08x%08x", ahigh, alow);
}
printk (KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
printk(KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
smp_processor_id(), i, high, low, misc, addr);
}
}
Expand Down
16 changes: 8 additions & 8 deletions trunk/arch/x86/kernel/cpu/mcheck/p6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
if (mcgstl & (1<<0)) /* Recoverable ? */
recover=0;

printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
smp_processor_id(), mcgsth, mcgstl);

for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
for (i = 0; i < nr_mce_banks; i++) {
rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high);
if (high & (1<<31)) {
char misc[20];
char addr[24];
Expand All @@ -42,14 +42,14 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
recover |= 2;
high &= ~(1<<31);
if (high & (1<<27)) {
rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
snprintf (misc, 20, "[%08x%08x]", ahigh, alow);
rdmsr(MSR_IA32_MC0_MISC+i*4, alow, ahigh);
snprintf(misc, 20, "[%08x%08x]", ahigh, alow);
}
if (high & (1<<26)) {
rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
snprintf (addr, 24, " at %08x%08x", ahigh, alow);
rdmsr(MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
snprintf(addr, 24, " at %08x%08x", ahigh, alow);
}
printk (KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
printk(KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
smp_processor_id(), i, high, low, misc, addr);
}
}
Expand Down

0 comments on commit e56399d

Please sign in to comment.