diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /include/linux/mm_inline.h | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'include/linux/mm_inline.h')
| -rw-r--r-- | include/linux/mm_inline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 8ac854f7f190..3b6723dfaff3 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h | |||
| @@ -32,7 +32,7 @@ del_page_from_lru(struct zone *zone, struct page *page) | |||
| 32 | { | 32 | { |
| 33 | list_del(&page->lru); | 33 | list_del(&page->lru); |
| 34 | if (PageActive(page)) { | 34 | if (PageActive(page)) { |
| 35 | ClearPageActive(page); | 35 | __ClearPageActive(page); |
| 36 | zone->nr_active--; | 36 | zone->nr_active--; |
| 37 | } else { | 37 | } else { |
| 38 | zone->nr_inactive--; | 38 | zone->nr_inactive--; |