Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c71c090f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 78ec75cd c2718348

drivers/edac/amd64_edac.c

+7 −0
Original line number Diff line number Diff line
@@ -868,6 +868,8 @@ static void amd64_read_dbam_reg(struct amd64_pvt *pvt) 
			goto err_reg;

	}



	return;



err_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);



	return;



err_reg:

	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 "

			"with EDAC module initialization\n");



		/* Signal good ECC status */

		ret = 0;



		/* CLEAR the override, since BIOS controlled it */

		ecc_enable_override = 0;

	}