diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /mm/swapfile.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index a1bc6b9af9a2..9c590eef7912 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -1151,8 +1151,7 @@ static int try_to_unuse(unsigned int type) | |||
| 1151 | } else | 1151 | } else |
| 1152 | retval = unuse_mm(mm, entry, page); | 1152 | retval = unuse_mm(mm, entry, page); |
| 1153 | 1153 | ||
| 1154 | if (set_start_mm && | 1154 | if (set_start_mm && *swap_map < swcount) { |
| 1155 | swap_count(*swap_map) < swcount) { | ||
| 1156 | mmput(new_start_mm); | 1155 | mmput(new_start_mm); |
| 1157 | atomic_inc(&mm->mm_users); | 1156 | atomic_inc(&mm->mm_users); |
| 1158 | new_start_mm = mm; | 1157 | new_start_mm = mm; |