diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
tree | 2624a44924c625c367f3cebf937853b9da2de282 /mm/swap.c | |
parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'mm/swap.c')
-rw-r--r-- | mm/swap.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -87,7 +87,7 @@ int rotate_reclaimable_page(struct page *page) | |||
87 | spin_lock_irqsave(&zone->lru_lock, flags); | 87 | spin_lock_irqsave(&zone->lru_lock, flags); |
88 | if (PageLRU(page) && !PageActive(page)) { | 88 | if (PageLRU(page) && !PageActive(page)) { |
89 | list_move_tail(&page->lru, &zone->inactive_list); | 89 | list_move_tail(&page->lru, &zone->inactive_list); |
90 | inc_page_state(pgrotated); | 90 | __count_vm_event(PGROTATED); |
91 | } | 91 | } |
92 | if (!test_clear_page_writeback(page)) | 92 | if (!test_clear_page_writeback(page)) |
93 | BUG(); | 93 | BUG(); |
@@ -107,7 +107,7 @@ void fastcall activate_page(struct page *page) | |||
107 | del_page_from_inactive_list(zone, page); | 107 | del_page_from_inactive_list(zone, page); |
108 | SetPageActive(page); | 108 | SetPageActive(page); |
109 | add_page_to_active_list(zone, page); | 109 | add_page_to_active_list(zone, page); |
110 | inc_page_state(pgactivate); | 110 | __count_vm_event(PGACTIVATE); |
111 | } | 111 | } |
112 | spin_unlock_irq(&zone->lru_lock); | 112 | spin_unlock_irq(&zone->lru_lock); |
113 | } | 113 | } |