ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register

[pandora-kernel.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 5bd5bb1..f5211b0 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1400,7 +1400,7 @@ static int get_any_page(struct page *p, unsigned long pfn, int flags)
                /* Not a free page */
                ret = 1;
        }
-       unset_migratetype_isolate(p);
+       unset_migratetype_isolate(p, MIGRATE_MOVABLE);
        unlock_memory_hotplug();
        return ret;
 }
@@ -1441,10 +1441,18 @@ static int soft_offline_huge_page(struct page *page, int flags)
                return ret;
        }
 done:
-       if (!PageHWPoison(hpage))
-               atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
-       set_page_hwpoison_huge_page(hpage);
-       dequeue_hwpoisoned_huge_page(hpage);
+       /* overcommit hugetlb page will be freed to buddy */
+       if (PageHuge(hpage)) {
+               if (!PageHWPoison(hpage))
+                       atomic_long_add(1 << compound_trans_order(hpage),
+                                       &mce_bad_pages);
+               set_page_hwpoison_huge_page(hpage);
+               dequeue_hwpoisoned_huge_page(hpage);
+       } else {
+               SetPageHWPoison(page);
+               atomic_long_inc(&mce_bad_pages);
+       }
+
        /* keep elevated page count for bad page */
        return ret;
 }
@@ -1475,9 +1483,17 @@ int soft_offline_page(struct page *page, int flags)
 {
        int ret;
        unsigned long pfn = page_to_pfn(page);
+       struct page *hpage = compound_trans_head(page);
 
        if (PageHuge(page))
                return soft_offline_huge_page(page, flags);
+       if (PageTransHuge(hpage)) {
+               if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) {
+                       pr_info("soft offline: %#lx: failed to split THP\n",
+                               pfn);
+                       return -EBUSY;
+               }
+       }
 
        ret = get_any_page(page, pfn, flags);
        if (ret < 0)