tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds b53343fc 5a8011cb

+3 -3
+1 -1
drivers/edac/octeon_edac-l2c.c
··· 151 151 l2c->ctl_name = "octeon_l2c_err"; 152 152 153 153 154 - if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) { 154 + if (OCTEON_IS_OCTEON1PLUS()) { 155 155 union cvmx_l2t_err l2t_err; 156 156 union cvmx_l2d_err l2d_err; 157 157
+1 -1
drivers/edac/octeon_edac-lmc.c
··· 234 234 layers[0].size = 1; 235 235 layers[0].is_virt_csrow = false; 236 236 237 - if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) { 237 + if (OCTEON_IS_OCTEON1PLUS()) { 238 238 union cvmx_lmcx_mem_cfg0 cfg0; 239 239 240 240 cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0));
+1 -1
drivers/edac/octeon_edac-pc.c
··· 73 73 edac_device_handle_ce(p->ed, cpu, 0, "dcache"); 74 74 75 75 /* Clear the error indication */ 76 - if (OCTEON_IS_MODEL(OCTEON_FAM_2)) 76 + if (OCTEON_IS_OCTEON2()) 77 77 write_octeon_c0_dcacheerr(1); 78 78 else 79 79 write_octeon_c0_dcacheerr(0);