mirror of
https://github.com/torvalds/linux.git
synced 2024-09-25 09:23:11 +00:00
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
This commit is contained in:
commit
c71c090ff9
|
@ -868,6 +868,8 @@ static void amd64_read_dbam_reg(struct amd64_pvt *pvt)
|
||||||
goto err_reg;
|
goto err_reg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
err_reg:
|
err_reg:
|
||||||
debugf0("Error reading F2x%03x.\n", reg);
|
debugf0("Error reading F2x%03x.\n", reg);
|
||||||
}
|
}
|
||||||
|
@ -2634,6 +2636,8 @@ static void amd64_read_mc_registers(struct amd64_pvt *pvt)
|
||||||
|
|
||||||
amd64_dump_misc_regs(pvt);
|
amd64_dump_misc_regs(pvt);
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
err_reg:
|
err_reg:
|
||||||
debugf0("Reading an MC register failed\n");
|
debugf0("Reading an MC register failed\n");
|
||||||
|
|
||||||
|
@ -2977,6 +2981,9 @@ static int amd64_check_ecc_enabled(struct amd64_pvt *pvt)
|
||||||
"ECC is enabled by BIOS, Proceeding "
|
"ECC is enabled by BIOS, Proceeding "
|
||||||
"with EDAC module initialization\n");
|
"with EDAC module initialization\n");
|
||||||
|
|
||||||
|
/* Signal good ECC status */
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
/* CLEAR the override, since BIOS controlled it */
|
/* CLEAR the override, since BIOS controlled it */
|
||||||
ecc_enable_override = 0;
|
ecc_enable_override = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user