Messages in this thread | | | Date | Wed, 2 Nov 2011 14:53:53 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tmem tree with Linus' tree |
| |
Hi Dan,
Today's linux-next merge of the tmem tree got a conflict in mm/swapfile.c between commit 43362a4977e3 ("oom: fix race while temporarily setting current's oom_score_adj") from Linus' tree and commit 6ce5607c1edf ("mm: frontswap: core swap subsystem hooks and headers") from the tmem tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/swapfile.c index c9d6540,9d79741..0000000 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@@ -1616,8 -1637,8 +1637,8 @@@ SYSCALL_DEFINE1(swapoff, const char __u spin_unlock(&swap_lock); oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX); - err = try_to_unuse(type); + err = try_to_unuse(type, false, 0); /* force all pages to be unused */ - test_set_oom_score_adj(oom_score_adj); + compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX, oom_score_adj); if (err) { /* [unhandled content-type:application/pgp-signature] | |