x86: coding style fixes to arch/x86/kernel/cpu/mcheck/k7.c
PATCH 1/1 x86: coding style fixes to arch/x86/kernel/cpu/mcheck/k7.c
Before:
total: 6 errors, 13 warnings, 105 lines checked
After:
total: 0 errors, 0 warnings, 105 lines checked
paolo@paolo-desktop:~/linux.trees.git$ size /tmp/k7* text data bss dec hex filename 1135 0 0 1135 46f /tmp/k7.o.after 1135 0 0 1135 46f /tmp/k7.o.before
paolo@paolo-desktop:~/linux.trees.git$ md5sum /tmp/k7* 87b14954045aa37dbaee6fb7e022ed9a /tmp/k7.o.after 87b14954045aa37dbaee6fb7e022ed9a /tmp/k7.o.before
Signed-off-by Paolo Ciarrocchi <[email protected]>
--- arch/x86/kernel/cpu/mcheck/k7.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)
arch/x86/kernel/cpu/mcheck/k7.c +18 -18
@@ -9,23 +9,23 @@#include <linux/interrupt.h> #include <linux/smp.h> -#include <asm/processor.h> +#include <asm/processor.h> #include <asm/system.h> #include <asm/msr.h> #include "mce.h" /* Machine Check Handler For AMD Athlon/Duron */ -static void k7_machine_check (struct pt_regs * regs,long error_code) +static void k7_machine_check (struct pt_regs *regs,long error_code) { -int recover=1 ; +int recover =1 ;u32 alow, ahigh, high, low;u32 mcgstl, mcgsth;int i; -rdmsr (MSR_IA32_MCG_STATUS , mcgstl, mcgsth); +rdmsr (MSR_IA32_MCG_STATUS , mcgstl, mcgsth);if (mcgstl & (1 <<0 ))/* Recoverable ? */ - recover=0 ; + recover =0 ;printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n" ,smp_processor_id (), mcgsth, mcgstl);
@@ -60,12 +60,12 @@ static void k7_machine_check(struct pt_regs * regs, long error_code) }if (recover&2 ) -panic ("CPU context corrupt" ); +panic ("CPU context corrupt" );if (recover&1 ) -panic ("Unable to continue" ); -printk (KERN_EMERG "Attempting to continue.\n" ); +panic ("Unable to continue" ); +printk (KERN_EMERG "Attempting to continue.\n" ); mcgstl &= ~(1 <<2 ); -wrmsr (MSR_IA32_MCG_STATUS ,mcgstl, mcgsth); +wrmsr (MSR_IA32_MCG_STATUS , mcgstl, mcgsth); }
@@ -81,25 +81,25 @@ void amd_mcheck_init(struct cpuinfo_x86 *c) machine_check_vector = k7_machine_check;wmb (); -printk (KERN_INFO "Intel machine check architecture supported.\n" ); -rdmsr (MSR_IA32_MCG_CAP , l, h); +printk (KERN_INFO "Intel machine check architecture supported.\n" ); +rdmsr (MSR_IA32_MCG_CAP , l, h);if (l & (1 <<8 ))/* Control register present ? */ -wrmsr (MSR_IA32_MCG_CTL ,0xffffffff ,0xffffffff ); +wrmsr (MSR_IA32_MCG_CTL ,0xffffffff ,0xffffffff ); nr_mce_banks = l &0xff ;/* Clear status for MC index 0 separately, we don't touch CTL, * as some K7 Athlons cause spurious MCEs when its enabled. */ if (boot_cpu_data.x86 ==6 ) { -wrmsr (MSR_IA32_MC0_STATUS ,0x0 ,0x0 ); +wrmsr (MSR_IA32_MC0_STATUS ,0x0 ,0x0 ); i =1 ; }else i =0 ; -for (; i<nr_mce_banks; i++) { -wrmsr (MSR_IA32_MC0_CTL +4 *i,0xffffffff ,0xffffffff ); -wrmsr (MSR_IA32_MC0_STATUS +4 *i,0x0 ,0x0 ); +for (; i < nr_mce_banks; i++) { +wrmsr (MSR_IA32_MC0_CTL +4 *i,0xffffffff ,0xffffffff ); +wrmsr (MSR_IA32_MC0_STATUS +4 *i,0x0 ,0x0 ); } -set_in_cr4 (X86_CR4_MCE ); -printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n" , +set_in_cr4 (X86_CR4_MCE ); +printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n" ,smp_processor_id ()); }
Signature · 1 line
1.5.6.rc1.21.g03300
Quoted 1 line
From
6b66e10dbd38c898af9a4df9ec8f79fe326ebaceMon Sep 17 00:00:00 2001
From: Paolo Ciarrocchi <[email protected]>
Date: Sat, 14 Jun 2008 14:01:14 +0200
Subject: [PATCH] x86: coding style fixes to arch/x86/kernel/cpu/mcheck/p4.c
Before:
total: 16 errors, 34 warnings, 257 lines checked
After:
total: 0 errors, 2 warnings, 257 lines checked
No changes in the compiled code:
paolo@paolo-desktop:~/linux.trees.git$ size /tmp/p4* text data bss dec hex filename 2644 4 4 2652 a5c /tmp/p4.o.after 2644 4 4 2652 a5c /tmp/p4.o.before
paolo@paolo-desktop:~/linux.trees.git$ md5sum /tmp/p4* 13f1b21c4246b31a28aaff38184586ca /tmp/p4.o.after 13f1b21c4246b31a28aaff38184586ca /tmp/p4.o.before
Signed-off-by Paolo Ciarrocchi <[email protected]>
--- arch/x86/kernel/cpu/mcheck/p4.c | 90 +++++++++++++++++++------------------- 1 files changed, 45 insertions(+), 45 deletions(-)
arch/x86/kernel/cpu/mcheck/p4.c +45 -45
181 lines not on this page · raw message
Signature · 1 line
1.5.6.rc1.21.g03300
Ingo Molnar
AppliedQuoted 5 lines · Paolo Ciarrocchi
Before:
total: 6 errors, 13 warnings, 105 lines checkedAfter:
total: 0 errors, 0 warnings, 105 lines checked
applied to tip/x86/cleanups, thanks.
Ingo