diff options
author | Ingo Molnar | 2016-05-12 09:18:13 +0200 |
---|---|---|
committer | Ingo Molnar | 2016-05-12 09:18:13 +0200 |
commit | eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6 (patch) | |
tree | 1b06e2c1beca8f970685eb13096c7a12480526c6 /drivers/edac/sb_edac.c | |
parent | sched/core: Fix comment typo in wake_q_add() (diff) | |
parent | Revert "sched/fair: Fix fairness issue on migration" (diff) | |
download | kernel-qcow2-linux-eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6.tar.gz kernel-qcow2-linux-eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6.tar.xz kernel-qcow2-linux-eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6.zip |
Merge branch 'sched/urgent' into sched/core to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/edac/sb_edac.c')
-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 468447aff8eb..8bf745d2da7e 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -3168,7 +3168,7 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val, mci = get_mci_for_node_id(mce->socketid); if (!mci) - return NOTIFY_BAD; + return NOTIFY_DONE; pvt = mci->pvt_info; /* |