x86, MCE: clean up trivial coding style problem
PATCH 1/1 x86, MCE: clean up trivial coding style problem
There are a lot of white-spaces that against the rule of coding style in __mcheck_cpu_apply_quirks(). This problem had been introduced by '575203b4747c(x86, MCE, AMD: Disable error thresholding bank 4 on some models)' and '2e6f694fde0a(x86, mce: port K7 bank 0 quirk to 64bit mce code)'
This may be an insignificant patch. However, if we allow them continue to survive, then this may make someone uncomfortable.
Signed-off-by Chen Yucong <[email protected]>
--- arch/x86/kernel/cpu/mcheck/mce.c | 54 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +27 -27
@@ -1530,45 +1530,45 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)* Various K7s with broken bank 0 around. Always disable * by default. */ -if (c->x86 ==6 && cfg->banks >0 ) +if (c->x86 ==6 && cfg->banks >0 ) mce_banks[0 ].ctl =0 ; -/* -* Turn off MC4_MISC thresholding banks on those models since -* they're not supported there. -*/ -if (c->x86 ==0x15 && - (c->x86_model >=0x10 && c->x86_model <=0x1f )) { -int i; -u64 val, hwcr; -bool need_toggle; -u32 msrs[] = { +/* +* Turn off MC4_MISC thresholding banks on those models since +* they're not supported there. +*/ +if (c->x86 ==0x15 && + (c->x86_model >=0x10 && c->x86_model <=0x1f )) { +int i; +u64 val, hwcr; +bool need_toggle; +u32 msrs[] = {0x00000413 ,/* MC4_MISC0 */ 0xc0000408 ,/* MC4_MISC1 */ - }; + }; -rdmsrl (MSR_K7_HWCR , hwcr); +rdmsrl (MSR_K7_HWCR , hwcr); -/* McStatusWrEn has to be set */ - need_toggle = !(hwcr &BIT (18 )); +/* McStatusWrEn has to be set */ + need_toggle = !(hwcr &BIT (18 )); -if (need_toggle) -wrmsrl (MSR_K7_HWCR , hwcr |BIT (18 )); +if (need_toggle) +wrmsrl (MSR_K7_HWCR , hwcr |BIT (18 )); -for (i =0 ; i <ARRAY_SIZE (msrs); i++) { -rdmsrl (msrs[i], val); +for (i =0 ; i <ARRAY_SIZE (msrs); i++) { +rdmsrl (msrs[i], val); -/* CntP bit set? */ -if (val &BIT_64 (62 )) { +/* CntP bit set? */ +if (val &BIT_64 (62 )) { val &= ~BIT_64 (62 );wrmsrl (msrs[i], val); - } - } + } + } -/* restore old settings */ -if (need_toggle) -wrmsrl (MSR_K7_HWCR , hwcr); - } +/* restore old settings */ +if (need_toggle) +wrmsrl (MSR_K7_HWCR , hwcr); + } }if (c->x86_vendor ==X86_VENDOR_INTEL ) {
Signature · 1 line
1.7.10.4