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

Commit 6885a7f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into next 

Pull EDAC changes from Borislav Petkov:
 "Just two small fixlets.

  We have more in the pipe but we didn't get ready in time so more stuff
  next time"

* tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Fix MC scrub mode comparsion bug for correctable errors
  EDAC, MCE, AMD: Remove leftover unused mask
parents 80fb9747 aa2064d7

drivers/edac/edac_mc.c

+1 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ static void edac_ce_error(struct mem_ctl_info *mci, 
	}

	edac_inc_ce_error(mci, enable_per_layer_report, pos, error_count);



	if (mci->scrub_mode & SCRUB_SW_SRC) {

	if (mci->scrub_mode == SCRUB_SW_SRC) {

		/*

			* Some memory controllers (called MCs below) can remap

			* memory so that it is still available at a different

drivers/edac/mce_amd.c

+0 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
static struct amd_decoder_ops *fam_ops;



static u8 xec_mask	 = 0xf;

static u8 nb_err_cpumask = 0xf;



static bool report_gart_errors;

static void (*nb_bus_decoder)(int node_id, struct mce *m);
@@ -852,7 +851,6 @@ static int __init mce_amd_init(void) 
		break;



	case 0x14:

		nb_err_cpumask  = 0x3;

		fam_ops->mc0_mce = cat_mc0_mce;

		fam_ops->mc1_mce = cat_mc1_mce;

		fam_ops->mc2_mce = k8_mc2_mce;