diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-31 02:37:44 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-31 02:37:44 +0100 |
commit | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (patch) | |
tree | aaf5ef8c6cd11764d222df9c446ad9af17e0020e /mm/thrash.c | |
parent | [PATCH] fec_8xx: Add support for Intel PHY LX971 (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-9e0cb06b17be7e562cbdaba2768649f025826dc6.tar.xz linux-9e0cb06b17be7e562cbdaba2768649f025826dc6.zip |
Merge branch 'master'
Diffstat (limited to 'mm/thrash.c')
-rw-r--r-- | mm/thrash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/thrash.c b/mm/thrash.c index 11461f7ad830..eff3c18c33a1 100644 --- a/mm/thrash.c +++ b/mm/thrash.c @@ -19,7 +19,7 @@ static unsigned long swap_token_check; struct mm_struct * swap_token_mm = &init_mm; #define SWAP_TOKEN_CHECK_INTERVAL (HZ * 2) -#define SWAP_TOKEN_TIMEOUT 0 +#define SWAP_TOKEN_TIMEOUT (300 * HZ) /* * Currently disabled; Needs further code to work at HZ * 300. */ |