tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: print debug statements only on error
amd64_edac: fix ECC checking

Linus Torvalds c71c090f 78ec75cd

+7
unified split
+7
drivers/edac/amd64_edac.c
··· 868 goto err_reg; 869 } 870 871 err_reg: 872 debugf0("Error reading F2x%03x.\n", reg); 873 } ··· 2636 2637 amd64_dump_misc_regs(pvt); 2638 2639 err_reg: 2640 debugf0("Reading an MC register failed\n"); 2641 ··· 2980 amd64_printk(KERN_INFO, 2981 "ECC is enabled by BIOS, Proceeding " 2982 "with EDAC module initialization\n"); 2983 2984 /* CLEAR the override, since BIOS controlled it */ 2985 ecc_enable_override = 0;
··· 868 goto err_reg; 869 } 870 871 + return; 872 + 873 err_reg: 874 debugf0("Error reading F2x%03x.\n", reg); 875 } ··· 2634 2635 amd64_dump_misc_regs(pvt); 2636 2637 + return; 2638 + 2639 err_reg: 2640 debugf0("Reading an MC register failed\n"); 2641 ··· 2976 amd64_printk(KERN_INFO, 2977 "ECC is enabled by BIOS, Proceeding " 2978 "with EDAC module initialization\n"); 2979 + 2980 + /* Signal good ECC status */ 2981 + ret = 0; 2982 2983 /* CLEAR the override, since BIOS controlled it */ 2984 ecc_enable_override = 0;