From 69acbad66b98f66af084b4cc37a53b6b91c2b642 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 30 Jan 2008 13:32:13 +0100 Subject: [PATCH] --- yaml --- r: 80113 b: refs/heads/master c: 7271339347653f6d652bb47aaee1f57d936002f6 h: refs/heads/master i: 80111: 30909e3de80b7b12563046a529b52498903f0d83 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/k7.c | 2 +- trunk/arch/x86/kernel/cpu/mcheck/p4.c | 2 +- trunk/arch/x86/kernel/cpu/mcheck/p6.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f114984d81ca..1b496c360991 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b912a1c73739b6016ced049552392a148c1736c8 +refs/heads/master: 7271339347653f6d652bb47aaee1f57d936002f6 diff --git a/trunk/arch/x86/kernel/cpu/mcheck/k7.c b/trunk/arch/x86/kernel/cpu/mcheck/k7.c index 55dfd4f9446a..e633c9c2b764 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/k7.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/k7.c @@ -31,7 +31,7 @@ static void k7_machine_check(struct pt_regs * regs, long error_code) smp_processor_id(), mcgsth, mcgstl); for (i = 1; i < nr_mce_banks; i++) { - rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high); + rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high); if (high&(1<<31)) { char misc[20]; char addr[24]; diff --git a/trunk/arch/x86/kernel/cpu/mcheck/p4.c b/trunk/arch/x86/kernel/cpu/mcheck/p4.c index 77463a3e9adf..cb03345554a5 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/p4.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/p4.c @@ -167,7 +167,7 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) } for (i = 0; i < nr_mce_banks; i++) { - rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high); + rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high); if (high & (1<<31)) { char misc[20]; char addr[24]; diff --git a/trunk/arch/x86/kernel/cpu/mcheck/p6.c b/trunk/arch/x86/kernel/cpu/mcheck/p6.c index 20376a2c0cf8..74342604d30e 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/p6.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/p6.c @@ -31,7 +31,7 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) smp_processor_id(), mcgsth, mcgstl); for (i = 0; i < nr_mce_banks; i++) { - rdmsr(MSR_IA32_MC0_STATUS+i*4,low, high); + rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high); if (high & (1<<31)) { char misc[20]; char addr[24];