aboutsummaryrefslogtreecommitdiff
path: root/mm/memory-failure.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-09-14 14:16:21 -0700
committerKevin Hilman <khilman@linaro.org>2015-09-14 14:16:21 -0700
commitf0b7ed42af0d718fc11d45f6c05948e9a11e08be (patch)
treefc1ed011273f1f503570b3595f018eb84b3872a1 /mm/memory-failure.c
parent4dddf720534a9a14fa9b048e7930dcc55b1b1e40 (diff)
parent4d869de174c78ae29ca91b41581367c8092d933d (diff)
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-15.09-android
Diffstat (limited to 'mm/memory-failure.c')
-rw-r--r--mm/memory-failure.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index ca96f411b034..f97d709594e6 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1473,6 +1473,8 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags)
*/
ret = __get_any_page(page, pfn, 0);
if (!PageLRU(page)) {
+ /* Drop page reference which is from __get_any_page() */
+ put_page(page);
pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n",
pfn, page->flags);
return -EIO;