diff options
| author | Benjamin Herrenschmidt <[email protected]> | 2012-12-18 10:22:27 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <[email protected]> | 2012-12-18 10:22:27 +1100 |
| commit | 376bddd34433065aeb9b9a140870537feecf90ef (patch) | |
| tree | a40e2b84ad89f4b3ba968de65a4bf7ff6ccae835 /mm/memory-failure.c | |
| parent | d526e85f60fce9aa2a1432cbd06e3cf20c1644c8 (diff) | |
| parent | 667b504a2c411e4d5915a6e2260a3857ba9f797a (diff) | |
Merge remote-tracking branch 'agust/next' into next
Brings some 52xx updates. Also manually merged tools/perf/perf.h.
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
Diffstat (limited to 'mm/memory-failure.c')
| -rw-r--r-- | mm/memory-failure.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 6c5899b9034a..8b20278be6a6 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1476,9 +1476,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) |