Skip to content

Commit c9ce871

Browse files
suryasaimadhuIngo Molnar
authored andcommitted
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>
1 parent f77ac50 commit c9ce871

File tree

1 file changed

+24
-24
lines changed
  • arch/x86/kernel/cpu/mcheck

1 file changed

+24
-24
lines changed

arch/x86/kernel/cpu/mcheck/mce.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,39 +1531,39 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
15311531
* Various K7s with broken bank 0 around. Always disable
15321532
* by default.
15331533
*/
1534-
if (c->x86 == 6 && cfg->banks > 0)
1534+
if (c->x86 == 6 && cfg->banks > 0)
15351535
mce_banks[0].ctl = 0;
15361536

1537-
/*
1538-
* Turn off MC4_MISC thresholding banks on those models since
1539-
* they're not supported there.
1540-
*/
1541-
if (c->x86 == 0x15 &&
1542-
(c->x86_model >= 0x10 && c->x86_model <= 0x1f)) {
1543-
int i;
1544-
u64 hwcr;
1545-
bool need_toggle;
1546-
u32 msrs[] = {
1537+
/*
1538+
* Turn off MC4_MISC thresholding banks on those models since
1539+
* they're not supported there.
1540+
*/
1541+
if (c->x86 == 0x15 &&
1542+
(c->x86_model >= 0x10 && c->x86_model <= 0x1f)) {
1543+
int i;
1544+
u64 hwcr;
1545+
bool need_toggle;
1546+
u32 msrs[] = {
15471547
0x00000413, /* MC4_MISC0 */
15481548
0xc0000408, /* MC4_MISC1 */
1549-
};
1549+
};
15501550

1551-
rdmsrl(MSR_K7_HWCR, hwcr);
1551+
rdmsrl(MSR_K7_HWCR, hwcr);
15521552

1553-
/* McStatusWrEn has to be set */
1554-
need_toggle = !(hwcr & BIT(18));
1553+
/* McStatusWrEn has to be set */
1554+
need_toggle = !(hwcr & BIT(18));
15551555

1556-
if (need_toggle)
1557-
wrmsrl(MSR_K7_HWCR, hwcr | BIT(18));
1556+
if (need_toggle)
1557+
wrmsrl(MSR_K7_HWCR, hwcr | BIT(18));
15581558

1559-
/* Clear CntP bit safely */
1560-
for (i = 0; i < ARRAY_SIZE(msrs); i++)
1561-
msr_clear_bit(msrs[i], 62);
1559+
/* Clear CntP bit safely */
1560+
for (i = 0; i < ARRAY_SIZE(msrs); i++)
1561+
msr_clear_bit(msrs[i], 62);
15621562

1563-
/* restore old settings */
1564-
if (need_toggle)
1565-
wrmsrl(MSR_K7_HWCR, hwcr);
1566-
}
1563+
/* restore old settings */
1564+
if (need_toggle)
1565+
wrmsrl(MSR_K7_HWCR, hwcr);
1566+
}
15671567
}
15681568

15691569
if (c->x86_vendor == X86_VENDOR_INTEL) {

0 commit comments

Comments
 (0)