X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-ia64%2Fpage.h;h=1dc2190f8d9fdbf7ec55661ff145eabac8ca091d;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=1b6fde4eb1fc471b54ac9c352e58f979b0e4ff28;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index 1b6fde4eb..1dc2190f8 100644
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -7,7 +7,7 @@
  *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
-# ifdef __KERNEL__
+#include <linux/config.h>
 
 #include <asm/intrinsics.h>
 #include <asm/types.h>
@@ -65,6 +65,7 @@
 # define __pa(x)		((x) - PAGE_OFFSET)
 # define __va(x)		((x) + PAGE_OFFSET)
 #else /* !__ASSEMBLY */
+# ifdef __KERNEL__
 #  define STRICT_MM_TYPECHECKS
 
 extern void clear_page (void *page);
@@ -126,9 +127,7 @@ extern unsigned long max_low_pfn;
 # define pfn_valid(pfn)		(((pfn) >= min_low_pfn) && ((pfn) < max_low_pfn) && ia64_pfn_valid(pfn))
 #endif
 
-#ifndef CONFIG_XEN
 #define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)
-#endif
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)
 
@@ -176,6 +175,7 @@ get_order (unsigned long size)
 	return order;
 }
 
+# endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
 
 #ifdef STRICT_MM_TYPECHECKS
@@ -229,54 +229,6 @@ get_order (unsigned long size)
 					 (((current->personality & READ_IMPLIES_EXEC) != 0)	\
 					  ? VM_EXEC : 0))
 
-#ifndef __ASSEMBLY__
-#ifdef CONFIG_XEN
-
-#include <linux/kernel.h>
-#include <asm/hypervisor.h>
-#include <xen/features.h>	// to compile netback, netfront
-
-/*
- * XXX hack!
- * Linux/IA64 uses PG_arch_1.
- * This hack will be removed once PG_foreign bit is taken.
- * #include <xen/foreign_page.h>
- */
-#ifdef __ASM_XEN_FOREIGN_PAGE_H__
-# error "don't include include/xen/foreign_page.h!"
-#endif
-
-extern struct address_space xen_ia64_foreign_dummy_mapping;
-#define PageForeign(page)	\
-	((page)->mapping == &xen_ia64_foreign_dummy_mapping)
-
-#define SetPageForeign(page, dtor) do {				\
-	set_page_private((page), (unsigned long)(dtor));	\
-	(page)->mapping = &xen_ia64_foreign_dummy_mapping;	\
-	smp_rmb();						\
-} while (0)
-
-#define ClearPageForeign(page) do {	\
-	(page)->mapping = NULL;		\
-	smp_rmb();			\
-	set_page_private((page), 0);	\
-} while (0)
-
-#define PageForeignDestructor(page)	\
-	( (void (*) (struct page *)) page_private(page) )
-
-#define arch_free_page(_page,_order)			\
-({      int foreign = PageForeign(_page);               \
-	if (foreign)                                    \
-		(PageForeignDestructor(_page))(_page);  \
-	foreign;                                        \
-})
-#define HAVE_ARCH_FREE_PAGE
-
-#include <asm/maddr.h>
-
-#endif /* CONFIG_XEN */
-#endif /* __ASSEMBLY__ */
 #define devmem_is_allowed(x) 1
-#endif /* __KERNEL__ */
+
 #endif /* _ASM_IA64_PAGE_H */