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

Commit 75a15a78 authored Jul 01, 2015 by Aaro Koskinen Committed by Borislav Petkov Jul 02, 2015

EDAC, octeon: Fix broken build due to model helper renames



Commit

  debe6a62 ("MIPS: OCTEON: Update octeon-model.h code for new SoCs.")

renamed some SoC model helper functions, but forgot to update the EDAC
drivers resulting in build failures. Fix that.

Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/1435747132-10954-1-git-send-email-aaro.koskinen@nokia.com


Signed-off-by: Borislav Petkov <bp@suse.de>

parent 043b4318

drivers/edac/octeon_edac-l2c.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev)
		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_l2d_err l2d_err;

drivers/edac/octeon_edac-lmc.c

+1 −1

Original line number	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].is_virt_csrow = false;

		if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
		if (OCTEON_IS_OCTEON1PLUS()) {
		union cvmx_lmcx_mem_cfg0 cfg0;

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

drivers/edac/octeon_edac-pc.c

+1 −1

Original line number	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");

		/* Clear the error indication */
		if (OCTEON_IS_MODEL(OCTEON_FAM_2))
		if (OCTEON_IS_OCTEON2())
		write_octeon_c0_dcacheerr(1);
		else
		write_octeon_c0_dcacheerr(0);