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
power: rk818 charger: remove suspend and resume callback
[firefly-linux-kernel-4.4.55.git]
/
mm
/
compaction.c
diff --git
a/mm/compaction.c
b/mm/compaction.c
index de3e1e71cd9f265d9df971e98ed931fbdc8611a8..7881e072dc33b0b36e5b46dc5d2a9206a2573c7f 100644
(file)
--- a/
mm/compaction.c
+++ b/
mm/compaction.c
@@
-880,16
+880,8
@@
isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn,
pfn = isolate_migratepages_block(cc, pfn, block_end_pfn,
ISOLATE_UNEVICTABLE);
pfn = isolate_migratepages_block(cc, pfn, block_end_pfn,
ISOLATE_UNEVICTABLE);
- /*
- * In case of fatal failure, release everything that might
- * have been isolated in the previous iteration, and signal
- * the failure back to caller.
- */
- if (!pfn) {
- putback_movable_pages(&cc->migratepages);
- cc->nr_migratepages = 0;
+ if (!pfn)
break;
break;
- }
if (cc->nr_migratepages == COMPACT_CLUSTER_MAX)
break;
if (cc->nr_migratepages == COMPACT_CLUSTER_MAX)
break;