vserver 1.9.5.x5

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

diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index 58cc744..24770c0 100644 (file)
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -75,6 +75,17 @@ do {                                         \
        flush_dcache_page(page);                \
 } while (0)
 
+
+#define alloc_zeroed_user_highpage(vma, vaddr) \
+({                                             \
+       struct page *page = alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO, vma, vaddr); \
+       if (page)                               \
+               flush_dcache_page(page);        \
+       page;                                   \
+})
+
+#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
+
 #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP
@@ -84,10 +95,16 @@ extern int ia64_pfn_valid (unsigned long pfn);
 #endif
 
 #ifndef CONFIG_DISCONTIGMEM
-#define pfn_valid(pfn)         (((pfn) < max_mapnr) && ia64_pfn_valid(pfn))
-#define page_to_pfn(page)      ((unsigned long) (page - mem_map))
-#define pfn_to_page(pfn)       (mem_map + (pfn))
-#endif /* CONFIG_DISCONTIGMEM */
+# define pfn_valid(pfn)                (((pfn) < max_mapnr) && ia64_pfn_valid(pfn))
+# define page_to_pfn(page)     ((unsigned long) (page - mem_map))
+# define pfn_to_page(pfn)      (mem_map + (pfn))
+#else
+extern struct page *vmem_map;
+extern unsigned long max_low_pfn;
+# define pfn_valid(pfn)                (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn))
+# define page_to_pfn(page)     ((unsigned long) (page - vmem_map))
+# define pfn_to_page(pfn)      (vmem_map + (pfn))
+#endif
 
 #define page_to_phys(page)     (page_to_pfn(page) << PAGE_SHIFT)
 #define virt_to_page(kaddr)    pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
@@ -117,7 +134,7 @@ typedef union ia64_va {
 #define REGION_KERNEL          7
 
 #ifdef CONFIG_HUGETLB_PAGE
-# define htlbpage_to_page(x)   ((REGION_NUMBER(x) << 61)                               \
+# define htlbpage_to_page(x)   (((unsigned long) REGION_NUMBER(x) << 61)                       \
                                 | (REGION_OFFSET(x) >> (HPAGE_SHIFT-PAGE_SHIFT)))
 # define HUGETLB_PAGE_ORDER    (HPAGE_SHIFT - PAGE_SHIFT)
 # define is_hugepage_only_range(addr, len)             \
@@ -180,11 +197,11 @@ get_order (unsigned long size)
 # define __pgprot(x)   (x)
 #endif /* !STRICT_MM_TYPECHECKS */
 
-#define PAGE_OFFSET                    0xe000000000000000
+#define PAGE_OFFSET                    __IA64_UL_CONST(0xe000000000000000)
 
 #define VM_DATA_DEFAULT_FLAGS          (VM_READ | VM_WRITE |                                   \
                                         VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC |                \
-                                        (((current->thread.flags & IA64_THREAD_XSTACK) != 0)   \
+                                        (((current->personality & READ_IMPLIES_EXEC) != 0)     \
                                          ? VM_EXEC : 0))
 
 #endif /* _ASM_IA64_PAGE_H */