Merge branch 'mce-ripvfix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce

Merge memory fault handling fix from Tony Luck.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index da27c5d2168a..c46ed494f002 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1186,6 +1186,7 @@ void mce_notify_process(void)
 {
         unsigned long pfn;
         struct mce_info *mi = mce_find_info();
+        int flags = MF_ACTION_REQUIRED;
 
         if (!mi)
                 mce_panic("Lost physical address for unconsumed uncorrectable error", NULL, NULL);
@@ -1200,8 +1201,9 @@ void mce_notify_process(void)
          * doomed. We still need to mark the page as poisoned and alert any
          * other users of the page.
          */
-        if (memory_failure(pfn, MCE_VECTOR, MF_ACTION_REQUIRED) < 0 ||
-                           mi->restartable == 0) {
+        if (!mi->restartable)
+                flags |= MF_MUST_KILL;
+        if (memory_failure(pfn, MCE_VECTOR, flags) < 0) {
                 pr_err("Memory error not recovered");
                 force_sig(SIGBUS, current);
         }