diff options
| author | Con Kolivas <kernel@kolivas.org> | 2004-12-20 23:51:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-20 23:51:50 -0800 |
| commit | e3513367414b3d5750e77f0f35f1c6f8582c4507 (patch) | |
| tree | f87208dba27fb0a1f5fe3b746294ce1e8ab5f6f2 /mm | |
| parent | 727a4b9f4a7105f6fb21623c896c69a6b148bf6f (diff) | |
| download | history-e3513367414b3d5750e77f0f35f1c6f8582c4507.tar.gz | |
[PATCH] vm: disable thrashing control by default
It's causing a few as-yet-not-understood problems. So make a zero value of
/proc/sys/vm/swap_token_timeout disable the feature, and make the default
be zero.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/rmap.c | 3 | ||||
| -rw-r--r-- | mm/thrash.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 83c86c2de4e5d0..a30ebc47127b0d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -395,6 +395,9 @@ int page_referenced(struct page *page, int is_locked, int ignore_token) { int referenced = 0; + if (!swap_token_default_timeout) + ignore_token = 1; + if (page_test_and_clear_young(page)) referenced++; diff --git a/mm/thrash.c b/mm/thrash.c index b6b7360a8b347a..985b6bbe964dec 100644 --- a/mm/thrash.c +++ b/mm/thrash.c @@ -19,7 +19,10 @@ unsigned long swap_token_check; struct mm_struct * swap_token_mm = &init_mm; #define SWAP_TOKEN_CHECK_INTERVAL (HZ * 2) -#define SWAP_TOKEN_TIMEOUT (HZ * 300) +#define SWAP_TOKEN_TIMEOUT 0 +/* + * Currently disabled; Needs further code to work at HZ * 300. + */ unsigned long swap_token_default_timeout = SWAP_TOKEN_TIMEOUT; /* |