Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index f75ab748e8cd..3a49036e0ae8 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -68,7 +68,7 @@ unsigned long setup_zero_pages(void)
         page = virt_to_page(empty_zero_page);
         while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) {
                 set_bit(PG_reserved, &page->flags);
-                set_page_count(page, 0);
+                reset_page_mapcount(page);
                 page++;
         }