projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-cpuidle', 'pm-opp' and 'pm-tools'
[firefly-linux-kernel-4.4.55.git]
/
mm
/
migrate.c
diff --git
a/mm/migrate.c
b/mm/migrate.c
index c3cb566af3e273a92e8353835b1cd6d03d64c7e3..7452a00bbb50c134b529c1d024dfc53fcfca093b 100644
(file)
--- 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);
+ put
back_active_huge
page(new_hpage);
if (result) {
if (rc)