Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux.git] / mm / thrash.c

diff --git a/mm/thrash.c b/mm/thrash.c
index 9ef9071f99bcd7322b8e1f6808a477403b891211..c4c5205a9c35f82c2dc34b52b4b37a8b0a0ecc44 100644 (file)
--- a/mm/thrash.c
+++ b/mm/thrash.c
@@ -48,9 +48,8 @@ void grab_swap_token(void)
                if (current_interval < current->mm->last_interval)
                        current->mm->token_priority++;
                else {
-                       current->mm->token_priority--;
-                       if (unlikely(current->mm->token_priority < 0))
-                               current->mm->token_priority = 0;
+                       if (likely(current->mm->token_priority > 0))
+                               current->mm->token_priority--;
                }
                /* Check if we deserve the token */
                if (current->mm->token_priority >