Hi,
This patch removes one redundant variable from mm/thrash.c and
moves the declaration of one variable closer to the block where
it is actually used.
Signed-off-by: Pekka Enberg <[EMAIL PROTECTED]>
---
thrash.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
Index: kernel/2.6/mm/thrash.c
===================================================================
--- kernel.orig/2.6/mm/thrash.c 2005-03-26 09:52:50.000000000 +0200
+++ kernel/2.6/mm/thrash.c 2005-03-26 10:00:58.000000000 +0200
@@ -51,9 +51,6 @@
*/
void grab_swap_token(void)
{
- struct mm_struct *mm;
- int reason;
-
/* We have the token. Let others know we still need it. */
if (has_swap_token(current->mm)) {
current->mm->recent_pagein = 1;
@@ -61,6 +58,7 @@
}
if (time_after(jiffies, swap_token_check)) {
+ int reason;
/* Can't get swapout protection if we exceed our RSS limit. */
// if (current->mm->rss > current->mm->rlimit_rss)
@@ -75,13 +73,12 @@
swap_token_check = jiffies + SWAP_TOKEN_CHECK_INTERVAL;
- mm = swap_token_mm;
- if ((reason = should_release_swap_token(mm))) {
+ if ((reason = should_release_swap_token(swap_token_mm))) {
unsigned long eligible = jiffies;
if (reason == SWAP_TOKEN_TIMED_OUT) {
eligible += swap_token_default_timeout;
}
- mm->swap_token_time = eligible;
+ swap_token_mm->swap_token_time = eligible;
swap_token_timeout = jiffies +
swap_token_default_timeout;
swap_token_mm = current->mm;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
