From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 22 Sep 2012 09:48:20 +0200 Subject: merge opensource jb u5 Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2 --- mm/swap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'mm/swap.c') diff --git a/mm/swap.c b/mm/swap.c index 4a1fc6d..2d8aeaf 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -373,12 +373,27 @@ EXPORT_SYMBOL(mark_page_accessed); void __lru_cache_add(struct page *page, enum lru_list lru) { +#ifndef CONFIG_DMA_CMA struct pagevec *pvec = &get_cpu_var(lru_add_pvecs)[lru]; page_cache_get(page); if (!pagevec_add(pvec, page)) ____pagevec_lru_add(pvec, lru); put_cpu_var(lru_add_pvecs); +#else + struct pagevec *pvec; + int is_cma; + + /* FIXME: too slow */ + is_cma = is_cma_pageblock(page); + + pvec = &get_cpu_var(lru_add_pvecs)[lru]; + + page_cache_get(page); + if (!pagevec_add(pvec, page) || is_cma) + ____pagevec_lru_add(pvec, lru); + put_cpu_var(lru_add_pvecs); +#endif } EXPORT_SYMBOL(__lru_cache_add); -- cgit v1.1