diff options
author | Borislav Petkov <bp@suse.de> | 2015-03-13 18:30:47 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-23 05:16:44 -0400 |
commit | c9ce8712838e48bf356144122c5ecdcdac5d1829 (patch) | |
tree | 3b80ba12a4ab423cf660102bd14ca95d61534026 | |
parent | f77ac507f893fc00c1b9ea0076f3c9e664b0f9ab (diff) |
x86/mce: Reindent __mcheck_cpu_apply_quirks() properly
Had some strange 3 tabs + 2 chars indentation, probably from me. Fix it.
No code changed:
# arch/x86/kernel/cpu/mcheck/mce.o:
text data bss dec hex filename
21371 5923 264 27558 6ba6 mce.o.before
21371 5923 264 27558 6ba6 mce.o.after
md5:
eb3996c84d15e08ed836f043df2cbb01 mce.o.before.asm
eb3996c84d15e08ed836f043df2cbb01 mce.o.after.asm
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 196a1e34fe39..8548b714a16b 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -1531,39 +1531,39 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) | |||
1531 | * Various K7s with broken bank 0 around. Always disable | 1531 | * Various K7s with broken bank 0 around. Always disable |
1532 | * by default. | 1532 | * by default. |
1533 | */ | 1533 | */ |
1534 | if (c->x86 == 6 && cfg->banks > 0) | 1534 | if (c->x86 == 6 && cfg->banks > 0) |
1535 | mce_banks[0].ctl = 0; | 1535 | mce_banks[0].ctl = 0; |
1536 | 1536 | ||
1537 | /* | 1537 | /* |
1538 | * Turn off MC4_MISC thresholding banks on those models since | 1538 | * Turn off MC4_MISC thresholding banks on those models since |
1539 | * they're not supported there. | 1539 | * they're not supported there. |
1540 | */ | 1540 | */ |
1541 | if (c->x86 == 0x15 && | 1541 | if (c->x86 == 0x15 && |
1542 | (c->x86_model >= 0x10 && c->x86_model <= 0x1f)) { | 1542 | (c->x86_model >= 0x10 && c->x86_model <= 0x1f)) { |
1543 | int i; | 1543 | int i; |
1544 | u64 hwcr; | 1544 | u64 hwcr; |
1545 | bool need_toggle; | 1545 | bool need_toggle; |
1546 | u32 msrs[] = { | 1546 | u32 msrs[] = { |
1547 | 0x00000413, /* MC4_MISC0 */ | 1547 | 0x00000413, /* MC4_MISC0 */ |
1548 | 0xc0000408, /* MC4_MISC1 */ | 1548 | 0xc0000408, /* MC4_MISC1 */ |
1549 | }; | 1549 | }; |
1550 | 1550 | ||
1551 | rdmsrl(MSR_K7_HWCR, hwcr); | 1551 | rdmsrl(MSR_K7_HWCR, hwcr); |
1552 | 1552 | ||
1553 | /* McStatusWrEn has to be set */ | 1553 | /* McStatusWrEn has to be set */ |
1554 | need_toggle = !(hwcr & BIT(18)); | 1554 | need_toggle = !(hwcr & BIT(18)); |
1555 | 1555 | ||
1556 | if (need_toggle) | 1556 | if (need_toggle) |
1557 | wrmsrl(MSR_K7_HWCR, hwcr | BIT(18)); | 1557 | wrmsrl(MSR_K7_HWCR, hwcr | BIT(18)); |
1558 | 1558 | ||
1559 | /* Clear CntP bit safely */ | 1559 | /* Clear CntP bit safely */ |
1560 | for (i = 0; i < ARRAY_SIZE(msrs); i++) | 1560 | for (i = 0; i < ARRAY_SIZE(msrs); i++) |
1561 | msr_clear_bit(msrs[i], 62); | 1561 | msr_clear_bit(msrs[i], 62); |
1562 | 1562 | ||
1563 | /* restore old settings */ | 1563 | /* restore old settings */ |
1564 | if (need_toggle) | 1564 | if (need_toggle) |
1565 | wrmsrl(MSR_K7_HWCR, hwcr); | 1565 | wrmsrl(MSR_K7_HWCR, hwcr); |
1566 | } | 1566 | } |
1567 | } | 1567 | } |
1568 | 1568 | ||
1569 | if (c->x86_vendor == X86_VENDOR_INTEL) { | 1569 | if (c->x86_vendor == X86_VENDOR_INTEL) { |