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
x86, boot: Move CPU flags out of cpucheck
[firefly-linux-kernel-4.4.55.git]
/
mm
/
vmscan.c
diff --git
a/mm/vmscan.c
b/mm/vmscan.c
index beb35778c69f147e47c30b44ee151953c68c4969..53f2f82f83ae0d16bf19646cdb5b3bce5fc4e4cf 100644
(file)
--- a/
mm/vmscan.c
+++ b/
mm/vmscan.c
@@
-48,6
+48,7
@@
#include <asm/div64.h>
#include <linux/swapops.h>
#include <asm/div64.h>
#include <linux/swapops.h>
+#include <linux/balloon_compaction.h>
#include "internal.h"
#include "internal.h"
@@
-1113,7
+1114,8
@@
unsigned long reclaim_clean_pages_from_list(struct zone *zone,
LIST_HEAD(clean_pages);
list_for_each_entry_safe(page, next, page_list, lru) {
LIST_HEAD(clean_pages);
list_for_each_entry_safe(page, next, page_list, lru) {
- if (page_is_file_cache(page) && !PageDirty(page)) {
+ if (page_is_file_cache(page) && !PageDirty(page) &&
+ !isolated_balloon_page(page)) {
ClearPageActive(page);
list_move(&page->lru, &clean_pages);
}
ClearPageActive(page);
list_move(&page->lru, &clean_pages);
}