Messages in this thread | | | Date | Thu, 31 May 2012 14:24:51 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/swap.c between commit fa9add641b1b ("mm/memcg: apply add/del_page to lruvec") from Linus' tree and commit "mm/huge_memory.c: use lockdep_assert_held()" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/swap.c index 4e7e2ec,8ff73d8..0000000 --- a/mm/swap.c +++ b/mm/swap.c @@@ -685,8 -653,7 +685,7 @@@ void lru_add_page_tail(struct page *pag VM_BUG_ON(!PageHead(page)); VM_BUG_ON(PageCompound(page_tail)); VM_BUG_ON(PageLRU(page_tail)); - VM_BUG_ON(NR_CPUS != 1 && - !spin_is_locked(&lruvec_zone(lruvec)->lru_lock)); - lockdep_assert_held(&zone->lru_lock); ++ lockdep_assert_held(&lruvec_zone(lruvec)->lru_lock); SetPageLRU(page_tail); [unhandled content-type:application/pgp-signature] | |