vserver 2.0 rc7

[linux-2.6.git] / include / asm-sh64 / pgalloc.h

diff --git a/include/asm-sh64/pgalloc.h b/include/asm-sh64/pgalloc.h
index 0272308..b25f5df 100644 (file)
--- a/include/asm-sh64/pgalloc.h
+++ b/include/asm-sh64/pgalloc.h
@@ -14,7 +14,6 @@
  *
  */
 
-#include <asm/processor.h>
 #include <linux/threads.h>
 #include <linux/mm.h>
 
@@ -112,9 +111,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
 {
        pte_t *pte;
 
-       pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT);
-       if (pte)
-               clear_page(pte);
+       pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT|__GFP_ZERO);
 
        return pte;
 }
@@ -123,9 +120,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add
 {
        struct page *pte;
 
-       pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
-       if (pte)
-               clear_page(page_address(pte));
+       pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
 
        return pte;
 }
@@ -150,9 +145,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add
 static __inline__ pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 {
        pmd_t *pmd;
-       pmd = (pmd_t *) __get_free_page(GFP_KERNEL|__GFP_REPEAT);
-       if (pmd)
-               clear_page(pmd);
+       pmd = (pmd_t *) __get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
        return pmd;
 }