summaryrefslogtreecommitdiff
path: root/mm/migrate.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-09-29 13:52:07 +0300
committerTakashi Iwai <tiwai@suse.de>2015-09-29 13:52:07 +0300
commitd8dfacf8b50c260d79864933ac82a8198a0908a9 (patch)
treeb172eb8643de7bd9f9439c58031b06c98116d86a /mm/migrate.c
parente87359efcaf45efc41dbaa6ec25eb26705300cee (diff)
parentdf075feefbd347f13fba5198294cda619532c237 (diff)
downloadlinux-d8dfacf8b50c260d79864933ac82a8198a0908a9.tar.xz
Merge branch 'topic/firewire-update' into for-next
Diffstat (limited to 'mm/migrate.c')
-rw-r--r--mm/migrate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index c3cb566af3e2..7452a00bbb50 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1075,7 +1075,7 @@ out:
if (rc != MIGRATEPAGE_SUCCESS && put_new_page)
put_new_page(new_hpage, private);
else
- put_page(new_hpage);
+ putback_active_hugepage(new_hpage);
if (result) {
if (rc)