summaryrefslogtreecommitdiffstats
path: root/drivers/base/memory.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-12-15 19:48:12 +0100
committerTony Luck <tony.luck@intel.com>2012-01-03 21:06:32 +0100
commitcd42f4a3b2b1c4cbd997363dc57821953d73fd87 (patch)
treec7db057922def7f742fbcd283324051bdd92b053 /drivers/base/memory.c
parentLinux 3.2-rc5 (diff)
downloadlinux-cd42f4a3b2b1c4cbd997363dc57821953d73fd87.tar.xz
linux-cd42f4a3b2b1c4cbd997363dc57821953d73fd87.zip
HWPOISON: Clean up memory_failure() vs. __memory_failure()
There is only one caller of memory_failure(), all other users call __memory_failure() and pass in the flags argument explicitly. The lone user of memory_failure() will soon need to pass flags too. Add flags argument to the callsite in mce.c. Delete the old memory_failure() function, and then rename __memory_failure() without the leading "__". Provide clearer message when action optional memory errors are ignored. Acked-by: Borislav Petkov <bp@amd64.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/base/memory.c')
-rw-r--r--drivers/base/memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 8272d92d22c0..9a924440053f 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -474,7 +474,7 @@ store_hard_offline_page(struct class *class,
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;
}