x86: unify tss_struct

[linux-2.6-omap-h63xx.git] / include / asm-x86 / page_64.h

diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h
index c3b52bcb171ef86852d819198d3b3b13f80bd94f..068b5e4cea4cdec769537c317587b864b20d2978 100644 (file)
--- a/include/asm-x86/page_64.h
+++ b/include/asm-x86/page_64.h
@@ -41,12 +41,24 @@
 #ifndef __ASSEMBLY__
 
 extern unsigned long end_pfn;
+extern unsigned long end_pfn_map;
 
-void clear_page(void *);
-void copy_page(void *, void *);
+void clear_page(void *page);
+void copy_page(void *to, void *from);
 
-#define clear_user_page(page, vaddr, pg)       clear_page(page)
-#define copy_user_page(to, from, vaddr, pg)    copy_page(to, from)
+struct page;
+
+static void inline clear_user_page(void *page, unsigned long vaddr,
+                               struct page *pg)
+{
+       clear_page(page);
+}
+
+static void inline copy_user_page(void *to, void *from, unsigned long vaddr,
+                               struct page *topage)
+{
+       copy_page(to, from);
+}
 
 #define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
        alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
@@ -121,9 +133,6 @@ extern unsigned long __phys_addr(unsigned long);
 #define __va(x)                        ((void *)((unsigned long)(x)+PAGE_OFFSET))
 #define __boot_va(x)           __va(x)
 #define __boot_pa(x)           __pa(x)
-#ifdef CONFIG_FLATMEM
-#define pfn_valid(pfn)         ((pfn) < end_pfn)
-#endif
 
 #define virt_to_page(kaddr)    pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)