diff options
| author | Mika Kukkonen <mikukkon@miku.homelinux.net> | 2007-05-11 07:22:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 17:29:32 +0200 |
| commit | 7faaa5f0bf4db6ac4908038e2139adc46c165ff4 (patch) | |
| tree | e6efe930b1749b4f133945468dad807c43fe1732 /mm | |
| parent | x86_64: display more intuitive error message if kernel is not 2MB aligned (diff) | |
| download | linux-7faaa5f0bf4db6ac4908038e2139adc46c165ff4.tar.xz linux-7faaa5f0bf4db6ac4908038e2139adc46c165ff4.zip | |
Bug in mm/thrash.c function grab_swap_token()
Following bug was uncovered by compiling with '-W' flag:
CC mm/thrash.o
mm/thrash.c: In function âgrab_swap_tokenâ:
mm/thrash.c:52: warning: comparison of unsigned expression < 0 is always false
Variable token_priority is unsigned, so decrementing first and then
checking the result does not work; fixed by reversing the test, patch
attached (compile tested only).
I am not sure if likely() makes much sense in this new situation, but
I'll let somebody else to make a decision on that.
Signed-off-by: Mika Kukkonen <mikukkon@iki.fi>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/thrash.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/thrash.c b/mm/thrash.c index 9ef9071f99bc..c4c5205a9c35 100644 --- 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 > |