aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-08 12:29:00 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-08 12:29:00 -0500
commit1e2a4c7a3f916f1caa5e68a9f2f7e6a04a0efa7e (patch)
tree5c4a34eb46cbf9b8272ad853e6f06e9c77b4db83
parente2857b8f11a289ed2b61d18d0665e05c1053c446 (diff)
parent83bdaad4d919722744ef1b726a9913ec36c6a430 (diff)
Merge tag 'edac_fix_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fix from Borislav Petkov: "Last minute fix for sb_edac which fixes DIMM detection on certain Xeon Phi configurations: A single fix to the Xeon Phi section of sb_edac. The issue was introduced during this merge window" * tag 'edac_fix_for_4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, sb_edac: Fix logic when computing DIMM sizes on Xeon Phi
-rw-r--r--drivers/edac/sb_edac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index e438ee5b433f..f5c6b97c8958 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1574,7 +1574,7 @@ static int knl_get_dimm_capacity(struct sbridge_pvt *pvt, u64 *mc_sizes)
1574 for (cha = 0; cha < KNL_MAX_CHAS; cha++) { 1574 for (cha = 0; cha < KNL_MAX_CHAS; cha++) {
1575 if (knl_get_mc_route(target, 1575 if (knl_get_mc_route(target,
1576 mc_route_reg[cha]) == channel 1576 mc_route_reg[cha]) == channel
1577 && participants[channel]) { 1577 && !participants[channel]) {
1578 participant_count++; 1578 participant_count++;
1579 participants[channel] = 1; 1579 participants[channel] = 1;
1580 break; 1580 break;