diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-08 09:29:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-08 09:29:00 -0800 |
| commit | 1e2a4c7a3f916f1caa5e68a9f2f7e6a04a0efa7e (patch) | |
| tree | 5c4a34eb46cbf9b8272ad853e6f06e9c77b4db83 | |
| parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 (diff) | |
| parent | 83bdaad4d919722744ef1b726a9913ec36c6a430 (diff) | |
| download | op-kernel-dev-1e2a4c7a3f916f1caa5e68a9f2f7e6a04a0efa7e.zip op-kernel-dev-1e2a4c7a3f916f1caa5e68a9f2f7e6a04a0efa7e.tar.gz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index e438ee5..f5c6b97 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) for (cha = 0; cha < KNL_MAX_CHAS; cha++) { if (knl_get_mc_route(target, mc_route_reg[cha]) == channel - && participants[channel]) { + && !participants[channel]) { participant_count++; participants[channel] = 1; break; |
