From: awilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Date: Sun, 28 Jan 2007 23:37:02 +0000 (-0700)
Subject: [IA64] Remove PG_foreign hack
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15372
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c77420064f61df61c2ecfc6da230895f0ceef4cd;p=xen.git

[IA64] Remove PG_foreign hack

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
index f65cf94ee1..695dc3bce5 100644
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
@@ -416,12 +416,6 @@ HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int count)
 }
 EXPORT_SYMBOL(HYPERVISOR_grant_table_op);
 
-///////////////////////////////////////////////////////////////////////////
-// PageForeign(), SetPageForeign(), ClearPageForeign()
-
-struct address_space xen_ia64_foreign_dummy_mapping;
-EXPORT_SYMBOL(xen_ia64_foreign_dummy_mapping);
-
 ///////////////////////////////////////////////////////////////////////////
 // foreign mapping
 #include <linux/efi.h>
diff --git a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h
index cacad452d8..c43348f26a 100644
--- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h
@@ -84,9 +84,6 @@ mfn_to_local_pfn(unsigned long mfn)
 
 #endif /* !CONFIG_XEN */
 
-/* XXX to compile set_phys_to_machine(vaddr, FOREIGN_FRAME(m)) */
-#define FOREIGN_FRAME(m)        (INVALID_P2M_ENTRY)
-
 #define mfn_to_pfn(mfn) (mfn)
 #define pfn_to_mfn(pfn) (pfn)
 
diff --git a/linux-2.6-xen-sparse/include/asm-ia64/page.h b/linux-2.6-xen-sparse/include/asm-ia64/page.h
index e8ad9ec4ee..4641560dab 100644
--- a/linux-2.6-xen-sparse/include/asm-ia64/page.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h
@@ -236,44 +236,6 @@ get_order (unsigned long size)
 #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 */