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

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

Merge tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC fix from Borislav Petkov:
 "A build fix for octeon_edac from Aaro Koskinen"

* tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, octeon: Fix broken build due to model helper renames
parents 5a8011cb 75a15a78

drivers/edac/octeon_edac-l2c.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev) 
	l2c->ctl_name = "octeon_l2c_err";

	l2c->ctl_name = "octeon_l2c_err";









	if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {

	if (OCTEON_IS_OCTEON1PLUS()) {

		union cvmx_l2t_err l2t_err;

		union cvmx_l2t_err l2t_err;

		union cvmx_l2d_err l2d_err;

		union cvmx_l2d_err l2d_err;

drivers/edac/octeon_edac-lmc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev) 
	layers[0].size = 1;

	layers[0].size = 1;

	layers[0].is_virt_csrow = false;

	layers[0].is_virt_csrow = false;





	if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {

	if (OCTEON_IS_OCTEON1PLUS()) {

		union cvmx_lmcx_mem_cfg0 cfg0;

		union cvmx_lmcx_mem_cfg0 cfg0;





		cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0));

		cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0));

drivers/edac/octeon_edac-pc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ static int co_cache_error_event(struct notifier_block *this, 
			edac_device_handle_ce(p->ed, cpu, 0, "dcache");

			edac_device_handle_ce(p->ed, cpu, 0, "dcache");





		/* Clear the error indication */

		/* Clear the error indication */

		if (OCTEON_IS_MODEL(OCTEON_FAM_2))

		if (OCTEON_IS_OCTEON2())

			write_octeon_c0_dcacheerr(1);

			write_octeon_c0_dcacheerr(1);

		else

		else

			write_octeon_c0_dcacheerr(0);

			write_octeon_c0_dcacheerr(0);