diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-08 11:29:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-08 11:30:49 +0200 |
| commit | 0a599838737a2527c35e4d94f794aefe59df1781 (patch) | |
| tree | b1f7571949527c459ca5e27bd420518e905c8b27 /mm/page_isolation.c | |
| parent | 2d846c74027231264e57e4e34faf9576394e3ce0 (diff) | |
| parent | a59d7199f62b8336570972dcc288321d0ec999fe (diff) | |
Merge branch 'for-linus' into for-next
Back merge HD-audio quirks to for-next branch, so that we can apply
a couple of more quirks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'mm/page_isolation.c')
| -rw-r--r-- | mm/page_isolation.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 72f5ac381ab3..755a42c76eb4 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -103,6 +103,7 @@ void unset_migratetype_isolate(struct page *page, unsigned migratetype) if (!is_migrate_isolate_page(buddy)) { __isolate_free_page(page, order); + kernel_map_pages(page, (1 << order), 1); set_page_refcounted(page); isolated_page = page; } |