summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/edac
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2015-10-09 08:42:44 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2015-10-09 08:52:35 +0300
commitfdb8b20906f3546ba6c2f9f0686d8a5189516ba3 (patch)
tree6bb43dc8a42d6e9403763bc749f706939dd2bc60 /kernel/drivers/edac
parentcc84a1f21026270463b580f2564f9d71912b20db (diff)
Kernel bump from 4.1.3-rt to 4.1.7-rt.
These changes brings a vanilla kernel from kernel.org, and the patch applied for rt is patch-4.1.7-rt8.patch. No further changes needed. Change-Id: Id8dd03c2ddd971e4d1d69b905f3069737053b700 Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/edac')
-rw-r--r--kernel/drivers/edac/octeon_edac-l2c.c2
-rw-r--r--kernel/drivers/edac/octeon_edac-lmc.c2
-rw-r--r--kernel/drivers/edac/octeon_edac-pc.c2
-rw-r--r--kernel/drivers/edac/ppc4xx_edac.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/kernel/drivers/edac/octeon_edac-l2c.c b/kernel/drivers/edac/octeon_edac-l2c.c
index 7e98084d3..afea7fc62 100644
--- a/kernel/drivers/edac/octeon_edac-l2c.c
+++ b/kernel/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/kernel/drivers/edac/octeon_edac-lmc.c b/kernel/drivers/edac/octeon_edac-lmc.c
index bb19e0732..cda6dab50 100644
--- a/kernel/drivers/edac/octeon_edac-lmc.c
+++ b/kernel/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/kernel/drivers/edac/octeon_edac-pc.c b/kernel/drivers/edac/octeon_edac-pc.c
index 0f83c33a7..2ab6cf24c 100644
--- a/kernel/drivers/edac/octeon_edac-pc.c
+++ b/kernel/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);
diff --git a/kernel/drivers/edac/ppc4xx_edac.c b/kernel/drivers/edac/ppc4xx_edac.c
index 3515b381c..711d8ad74 100644
--- a/kernel/drivers/edac/ppc4xx_edac.c
+++ b/kernel/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