diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 19:59:46 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 19:59:46 +0400 |
| commit | 6885a7f1ed88607cc9945bb106474ecfecb8e59b (patch) | |
| tree | 3d377216dc21276909e5d20c30613eb830e45b31 /drivers/edac/edac_mc.c | |
| parent | 80fb97479878f2c7c4f300de7758304fc0401006 (diff) | |
| parent | aa2064d7dd35ac5812645780d2f22a7899e7c6e1 (diff) | |
| download | linux-6885a7f1ed88607cc9945bb106474ecfecb8e59b.tar.xz | |
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
Diffstat (limited to 'drivers/edac/edac_mc.c')
| -rw-r--r-- | drivers/edac/edac_mc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 33edd6766344..2c694b5297cc 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -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 |