Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e2a4c7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e2857b8f 83bdaad4

drivers/edac/sb_edac.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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++) {

				for (cha = 0; cha < KNL_MAX_CHAS; cha++) {

					if (knl_get_mc_route(target,

					if (knl_get_mc_route(target,

						mc_route_reg[cha]) == channel

						mc_route_reg[cha]) == channel

						&& participants[channel]) {

						&& !participants[channel]) {

						participant_count++;

						participant_count++;

						participants[channel] = 1;

						participants[channel] = 1;

						break;

						break;