linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / m68k / mm / memory.c

diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c
index a0c095e..559942c 100644 (file)
--- a/arch/m68k/mm/memory.c
+++ b/arch/m68k/mm/memory.c
@@ -4,6 +4,7 @@
  *  Copyright (C) 1995  Hamish Macdonald
  */
 
+#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -53,7 +54,7 @@ void __init init_pointer_table(unsigned long ptable)
 
        /* unreserve the page so it's possible to free that page */
        PD_PAGE(dp)->flags &= ~(1 << PG_reserved);
-       init_page_count(PD_PAGE(dp));
+       set_page_count(PD_PAGE(dp), 1);
 
        return;
 }
@@ -93,7 +94,8 @@ pmd_t *get_pointer_table (void)
        PD_MARKBITS(dp) = mask & ~tmp;
        if (!PD_MARKBITS(dp)) {
                /* move to end of list */
-               list_move_tail(dp, &ptable_list);
+               list_del(dp);
+               list_add_tail(dp, &ptable_list);
        }
        return (pmd_t *) (page_address(PD_PAGE(dp)) + off);
 }
@@ -121,7 +123,8 @@ int free_pointer_table (pmd_t *ptable)
                 * move this descriptor to the front of the list, since
                 * it has one or more free tables.
                 */
-               list_move(dp, &ptable_list);
+               list_del(dp);
+               list_add(dp, &ptable_list);
        }
        return 0;
 }