summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWanpeng Li <liwanp@linux.vnet.ibm.com>2013-09-11 23:23:02 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 00:58:12 +0200
commit8302423b8e85ad6caa8687f06157d43f684a42e2 (patch)
treebee84ab5cec30fa71c0449f6589955293db9ee44 /mm
parentmm/memory-failure.c: fix bug triggered by unpoisoning empty zero page (diff)
downloadlinux-8302423b8e85ad6caa8687f06157d43f684a42e2.tar.xz
linux-8302423b8e85ad6caa8687f06157d43f684a42e2.zip
mm/madvise.c: fix return value of madvise_hwpoison()
The return value outside for loop is always zero which means madvise_hwpoison return success, however, this is not truth for soft_offline_page w/ failure return value. Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--mm/madvise.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/madvise.c b/mm/madvise.c
index 30293ab95b06..51bffa414027 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -361,7 +361,7 @@ static int madvise_hwpoison(int bhv, unsigned long start, unsigned long end)
page_to_pfn(p), start);
ret = soft_offline_page(p, MF_COUNT_INCREASED);
if (ret)
- break;
+ return ret;
continue;
}
pr_info("Injecting memory failure for page %#lx at %#lx\n",