linux-next: manual merge of the akpm-current tree with the tip tree
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/swap.c
between commit:
b01b21419999 ("mm/swap: Use local_lock for protection")
from the tip tree and commit:
48c1ce8726a7 ("mm: fold and remove lru_cache_add_anon() and lru_cache_add_file()")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Signature · 30 lines
Cheers,
Stephen Rothwell
diff --cc mm/swap.c
index 0ac463d44cff,acd88873f076..000000000000
--- a/mm/swap.c
+++ b/mm/swap.c
@@@ -468,10 -435,17 +459,19 @@@ EXPORT_SYMBOL(mark_page_accessed)
*/
void lru_cache_add(struct page *page)
{
- struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
++ struct pagevec *pvec;
+
VM_BUG_ON_PAGE(PageActive(page) && PageUnevictable(page), page);
VM_BUG_ON_PAGE(PageLRU(page), page);
- __lru_cache_add(page);
+
++ local_lock(&lru_pvecs.lock);
++ pvec = this_cpu_ptr(&lru_pvecs.lru_add);
+ get_page(page);
+ if (!pagevec_add(pvec, page) || PageCompound(page))
+ __pagevec_lru_add(pvec);
- put_cpu_var(lru_add_pvec);
++ local_unlock(&lru_pvecs.lock);
}
+ EXPORT_SYMBOL(lru_cache_add);
/**
* lru_cache_add_active_or_unevictable