diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-17 12:15:49 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-17 12:15:49 +0200 |
commit | 9a652cc01e589e10e2aa341074ea240c9838102b (patch) | |
tree | 48ec31db7a09a0e6b7cca66ea08b20cc78f218cb /mm/swap.c | |
parent | e8fcdf1e65c71340972041295fb7b3e59929b761 (diff) | |
parent | 99ee87295017e36abb6925e6139ca303cb55aee7 (diff) | |
download | linux-9a652cc01e589e10e2aa341074ea240c9838102b.tar.gz |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge request by Jani to get at commit 249c4f538b1aae55d41699f8bafc6cb762a7f48f Author: Deepak M <m.deepak@intel.com> Date: Wed Mar 30 17:03:39 2016 +0300 drm: Add new DCS commands in the enum list Some simple conflicts in intel_dp.c. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'mm/swap.c')
-rw-r--r-- | mm/swap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/swap.c b/mm/swap.c index a0bc206b4ac6..03aacbcb013f 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -728,6 +728,11 @@ void release_pages(struct page **pages, int nr, bool cold) zone = NULL; } + if (is_huge_zero_page(page)) { + put_huge_zero_page(); + continue; + } + page = compound_head(page); if (!put_page_testzero(page)) continue; |