diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-14 11:27:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-14 11:27:10 +0100 |
| commit | 095857390c54551a081d0286d3a39c7c049d0d33 (patch) | |
| tree | d5aa00ce86075df41ce7353166035d640340cd9a /mm | |
| parent | fa4b900fcaa6092a43fd60fe7dd72f8df654bcde (diff) | |
| parent | 7fc878164dd8bc7812eb774e728f2cc1ffe905ed (diff) | |
Merge tag 'v3.10.16' into linux-linaro-lsk
This is the 3.10.16 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/bounce.c | 2 | ||||
| -rw-r--r-- | mm/migrate.c | 2 | ||||
| -rw-r--r-- | mm/vmscan.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index c9f0a4339a7..5a7d58fb883 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -204,6 +204,8 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, struct bio_vec *to, *from; unsigned i; + if (force) + goto bounce; bio_for_each_segment(from, *bio_orig, i) if (page_to_pfn(from->bv_page) > queue_bounce_pfn(q)) goto bounce; diff --git a/mm/migrate.c b/mm/migrate.c index 6f0c24438bb..25ca7caf909 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -103,7 +103,7 @@ void putback_movable_pages(struct list_head *l) list_del(&page->lru); dec_zone_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page)); - if (unlikely(balloon_page_movable(page))) + if (unlikely(isolated_balloon_page(page))) balloon_page_putback(page); else putback_lru_page(page); diff --git a/mm/vmscan.c b/mm/vmscan.c index fa6a85378ee..7dbdb6afd10 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -48,6 +48,7 @@ #include <asm/div64.h> #include <linux/swapops.h> +#include <linux/balloon_compaction.h> #include "internal.h" @@ -978,7 +979,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) { - 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); } |