Merge tag 'mce-recovery-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce

Implement MCE recovery for the data load error path and assorted cleanups.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index ed5de58c340f..9b3a71e391f4 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -466,7 +466,7 @@ store_hard_offline_page(struct device *dev,
         if (strict_strtoull(buf, 0, &pfn) < 0)
                 return -EINVAL;
         pfn >>= PAGE_SHIFT;
-        ret = __memory_failure(pfn, 0, 0);
+        ret = memory_failure(pfn, 0, 0);
         return ret ? ret : count;
 }