diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2009-06-16 18:32:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:47:42 -0400 |
commit | 6837765963f1723e80ca97b1fae660f3a60d77df (patch) | |
tree | a9a6ed4b7e3bf188966da78b04bf39298f24375a /mm/vmscan.c | |
parent | bce7394a3ef82b8477952fbab838e4a6e8cb47d2 (diff) |
mm: remove CONFIG_UNEVICTABLE_LRU config option
Currently, nobody wants to turn UNEVICTABLE_LRU off. Thus this
configurability is unnecessary.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andi Kleen <andi@firstfloor.org>
Acked-by: Minchan Kim <minchan.kim@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 879d034930c..2c4b945b011 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -514,7 +514,6 @@ int remove_mapping(struct address_space *mapping, struct page *page) | |||
514 | * | 514 | * |
515 | * lru_lock must not be held, interrupts must be enabled. | 515 | * lru_lock must not be held, interrupts must be enabled. |
516 | */ | 516 | */ |
517 | #ifdef CONFIG_UNEVICTABLE_LRU | ||
518 | void putback_lru_page(struct page *page) | 517 | void putback_lru_page(struct page *page) |
519 | { | 518 | { |
520 | int lru; | 519 | int lru; |
@@ -568,20 +567,6 @@ redo: | |||
568 | put_page(page); /* drop ref from isolate */ | 567 | put_page(page); /* drop ref from isolate */ |
569 | } | 568 | } |
570 | 569 | ||
571 | #else /* CONFIG_UNEVICTABLE_LRU */ | ||
572 | |||
573 | void putback_lru_page(struct page *page) | ||
574 | { | ||
575 | int lru; | ||
576 | VM_BUG_ON(PageLRU(page)); | ||
577 | |||
578 | lru = !!TestClearPageActive(page) + page_is_file_cache(page); | ||
579 | lru_cache_add_lru(page, lru); | ||
580 | put_page(page); | ||
581 | } | ||
582 | #endif /* CONFIG_UNEVICTABLE_LRU */ | ||
583 | |||
584 | |||
585 | /* | 570 | /* |
586 | * shrink_page_list() returns the number of reclaimed pages | 571 | * shrink_page_list() returns the number of reclaimed pages |
587 | */ | 572 | */ |
@@ -2470,7 +2455,6 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) | |||
2470 | } | 2455 | } |
2471 | #endif | 2456 | #endif |
2472 | 2457 | ||
2473 | #ifdef CONFIG_UNEVICTABLE_LRU | ||
2474 | /* | 2458 | /* |
2475 | * page_evictable - test whether a page is evictable | 2459 | * page_evictable - test whether a page is evictable |
2476 | * @page: the page to test | 2460 | * @page: the page to test |
@@ -2717,4 +2701,3 @@ void scan_unevictable_unregister_node(struct node *node) | |||
2717 | sysdev_remove_file(&node->sysdev, &attr_scan_unevictable_pages); | 2701 | sysdev_remove_file(&node->sysdev, &attr_scan_unevictable_pages); |
2718 | } | 2702 | } |
2719 | 2703 | ||
2720 | #endif | ||