Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[mv-sheeva.git] / mm / swap.c

diff --git a/mm/swap.c b/mm/swap.c
index 21d15f99805c96517c21927817512d749017c244..d09cf7f03e767e57e500ac5f6dd4c35c72c5f9a4 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -39,7 +39,7 @@ int page_cluster;
 void put_page(struct page *page)
 {
        if (unlikely(PageCompound(page))) {
-               page = (struct page *)page->private;
+               page = (struct page *)page_private(page);
                if (put_page_testzero(page)) {
                        void (*dtor)(struct page *page);
 
@@ -259,6 +259,8 @@ void __pagevec_release(struct pagevec *pvec)
        pagevec_reinit(pvec);
 }
 
+EXPORT_SYMBOL(__pagevec_release);
+
 /*
  * pagevec_release() for pages which are known to not be on the LRU
  *
@@ -270,7 +272,6 @@ void __pagevec_release_nonlru(struct pagevec *pvec)
        struct pagevec pages_to_free;
 
        pagevec_init(&pages_to_free, pvec->cold);
-       pages_to_free.cold = pvec->cold;
        for (i = 0; i < pagevec_count(pvec); i++) {
                struct page *page = pvec->pages[i];
 
@@ -388,6 +389,7 @@ unsigned pagevec_lookup_tag(struct pagevec *pvec, struct address_space *mapping,
        return pagevec_count(pvec);
 }
 
+EXPORT_SYMBOL(pagevec_lookup_tag);
 
 #ifdef CONFIG_SMP
 /*
@@ -411,7 +413,6 @@ void vm_acct_memory(long pages)
        }
        preempt_enable();
 }
-EXPORT_SYMBOL(vm_acct_memory);
 
 #ifdef CONFIG_HOTPLUG_CPU
 static void lru_drain_cache(unsigned int cpu)