linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h
index 4e96d77..f2f2338 100644 (file)
--- a/include/asm-ia64/pgalloc.h
+++ b/include/asm-ia64/pgalloc.h
@@ -1,10 +1,6 @@
 #ifndef _ASM_IA64_PGALLOC_H
 #define _ASM_IA64_PGALLOC_H
 
-#define arch_add_exec_range(mm, limit)         do { ; } while (0)
-#define arch_flush_exec_range(mm)              do { ; } while (0)
-#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
-
 /*
  * This file contains the functions and defines necessary to allocate
  * page tables.
@@ -17,6 +13,7 @@
  * Copyright (C) 2000, Goutham Rao <goutham.rao@intel.com>
  */
 
+#include <linux/config.h>
 
 #include <linux/compiler.h>
 #include <linux/mm.h>
@@ -129,11 +126,7 @@ static inline void pmd_free(pmd_t * pmd)
 static inline void
 pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte)
 {
-#ifndef CONFIG_XEN
        pmd_val(*pmd_entry) = page_to_phys(pte);
-#else
-       pmd_val(*pmd_entry) = page_to_pseudophys(pte);
-#endif
 }
 
 static inline void