Merge tag 'v3.3-rc7' into x86/mce

[~andy/linux] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 9e60dbe9fd94884cb5850f10af74567a9bc6300f..7dda4f790f00d58145cc3b58ce4607c42ea829b1 100644 (file)
--- 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;
 }