From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 05:04:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'tmem/tmem'
X-Git-Tag: next-20111214~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2ca854a890816c5131b609849a39a54255e9a017;p=karo-tx-linux.git

Merge remote-tracking branch 'tmem/tmem'

Conflicts:
	mm/swapfile.c
---

2ca854a890816c5131b609849a39a54255e9a017
diff --cc mm/swapfile.c
index b1cd12060723,9d79741712ff..9b71e6dc0650
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@@ -1615,8 -1637,8 +1636,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) {
  		/*