leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two small fixlets.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTjD0ZAAoJEBLB8Bhh3lVKvNUP/2NHflCs3UfGjECWPxGiq2Kp
 9jFDZt0UPgip2Ku9Xpm5rjeQZmPUo1voMgcviZ9A6mQksc3SBd5ztbxbYfDol399
 YwmzEbYQBmH2iEgLLGGFltMXDpJRMb+WSo9+2VKs/VqpUFT68fVIDruNwSSMM2Jn
 djhBbAXDf5MzhYDP/nYjxLXQq0ItQjXkHYoXlrpmYTznb2dJtllI/MuVhJjr7JrH
 fdtgSeu1UMNjPPeiV4CaWelU8RRAFdUcDKuUNaURjpjyaS+f4bQQ6BIS3XRnq135
 5jb7RE27SodkAHRemA8IxPWTldycxVCLuAUwpNiIf7NdpIMjjym22msBJfDw148J
 ybx36pmk0+Xs9ejM70ZHBkaymCzdh/tAneFheDSK+Dd4gUUvxduxxHcO1KVzzYPf
 +kASqneo0aS8FsUowsB9gsoBD8U/AGpyJ80m14grLBnv+iSAAEMDbA0XtEMjzlx6
 4ygNiMc/MglJIYMznQTf0MYkcMNKJ3UM77CaP0TwbeQKnejRnb82anjaU/8tprkI
 oqlodjBwCzRFPJugxWx9M8vXheIvqekwymYvSpDGJGTxz5iQSX2XzE91c95nM/v4
 eSZFp6KqSpyFyULJdTUm0JMwRwnlZFpLt7EK03GHwLkU9WeMiNsMD7K+twp6OPiG
 ZfvGd4SZlB3pHtl0Vfm+
 =miRu
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-06-02 08:59:46 -07:00
commit 6885a7f1ed
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/edac/edac_mc.c
View File

@ -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

2
drivers/edac/mce_amd.c
View File

@ -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;