Patch "EDAC, octeon: Fix broken build due to model helper renames" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
edac-octeon-fix-broken-build-due-to-model-helper-renames.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Aaro Koskinen <[email protected]>
Date: Wed, 1 Jul 2015 13:38:52 +0300
Subject: EDAC, octeon: Fix broken build due to model helper renames

From: Aaro Koskinen <[email protected]>

commit 75a15a7864c9e281c74a1670b10b69d1d7ff1c82 upstream.

Commit

debe6a623d3c ("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.

---
 drivers/edac/octeon_edac-l2c.c |    2 +-
 drivers/edac/octeon_edac-lmc.c |    2 +-
 drivers/edac/octeon_edac-pc.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platf
 	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;
 

@@ -234,7 +234,7 @@ static int octeon_lmc_edac_probe(struct
 	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));

@@ -73,7 +73,7 @@ static int  co_cache_error_event(struct
 			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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/edac-octeon-fix-broken-build-due-to-model-helper-renames.patch