[GIT PULL] EDAC fix for 4.2

[GIT PULL] EDAC fix for 4.2

[Borislav Petkov]

Hi Linus,

please pull this octeon_edac build fix which missed the regular EDAC
submission.

Thanks.

The following changes since commit 043b43180efee8dcc41dde5ca710827b26d17510:

  EDAC: Update Documentation/edac.txt (2015-06-24 18:17:40 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_urgent_for_4.2

for you to fetch changes up to 75a15a7864c9e281c74a1670b10b69d1d7ff1c82:

  EDAC, octeon: Fix broken build due to model helper renames (2015-07-02 10:46:28 +0200)

----------------------------------------------------------------
A build fix for octeon_edac from Aaro Koskinen.

----------------------------------------------------------------
Aaro Koskinen (1):
      EDAC, octeon: Fix broken build due to model helper renames

 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(-)

diff --git a/drivers/edac/octeon_edac-l2c.c b/drivers/edac/octeon_edac-l2c.c
index 7e98084d3645..afea7fc625cc 100644
--- a/drivers/edac/octeon_edac-l2c.c
+++ b/drivers/edac/octeon_edac-l2c.c
@@ -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;
 
diff --git a/drivers/edac/octeon_edac-lmc.c b/drivers/edac/octeon_edac-lmc.c
index bb19e0732681..cda6dab5067a 100644
--- a/drivers/edac/octeon_edac-lmc.c
+++ b/drivers/edac/octeon_edac-lmc.c
@@ -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));
diff --git a/drivers/edac/octeon_edac-pc.c b/drivers/edac/octeon_edac-pc.c
index 0f83c33a7d1f..2ab6cf24c959 100644
--- a/drivers/edac/octeon_edac-pc.c
+++ b/drivers/edac/octeon_edac-pc.c
@@ -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);

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

[GIT PULL] EDAC fix for 4.2

[Borislav Petkov]

Hi Linus,

please pull a ppc4xx_edac fix for an oops due to wrongly dereferencing a
csrow descriptor.

Thanks.

---
The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

  Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_fix_for_4.2

for you to fetch changes up to 5c16179b550b9fd8114637a56b153c9768ea06a5:

  EDAC, ppc4xx: Access mci->csrows array elements properly (2015-08-13 06:02:19 +0200)

----------------------------------------------------------------
A ppc4xx_edac fix for accessing ->csrows properly. This driver was
missed during the conversion a couple of years ago.

----------------------------------------------------------------
Michael Walle (1):
      EDAC, ppc4xx: Access mci->csrows array elements properly

 drivers/edac/ppc4xx_edac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 3515b381c131..711d8ad74f11 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -920,7 +920,7 @@ static int ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
 	 */
 
 	for (row = 0; row < mci->nr_csrows; row++) {
-		struct csrow_info *csi = &mci->csrows[row];
+		struct csrow_info *csi = mci->csrows[row];
 
 		/*
 		 * Get the configuration settings for this

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--