Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/linux/kernel.h

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/page_io.c b/mm/page_io.c
index bb2b0d53889c..88029948d00a 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -101,7 +101,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
         }
         if (wbc->sync_mode == WB_SYNC_ALL)
                 rw |= (1 << BIO_RW_SYNC);
-        inc_page_state(pswpout);
+        count_vm_event(PSWPOUT);
         set_page_writeback(page);
         unlock_page(page);
         submit_bio(rw, bio);
@@ -123,7 +123,7 @@ int swap_readpage(struct file *file, struct page *page)
                 ret = -ENOMEM;
                 goto out;
         }
-        inc_page_state(pswpin);
+        count_vm_event(PSWPIN);
         submit_bio(READ, bio);
 out:
         return ret;