diff --git a/[refs] b/[refs] index 9812329e07da..54304c00a690 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 069f11f9d66bc582fb40a37a7b92363f5d321969 +refs/heads/master: 7faaa5f0bf4db6ac4908038e2139adc46c165ff4 diff --git a/trunk/mm/thrash.c b/trunk/mm/thrash.c index 9ef9071f99bc..c4c5205a9c35 100644 --- a/trunk/mm/thrash.c +++ b/trunk/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 >