ia64/xen-unstable

changeset 13673:e5cfd902d7e4

[IA64] Remove PG_foreign hack

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author awilliam@xenbuild2.aw
date Sun Jan 28 16:37:02 2007 -0700 (2007-01-28)
parents d14da87feed6
children 7286802c9619
files linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c linux-2.6-xen-sparse/include/asm-ia64/maddr.h linux-2.6-xen-sparse/include/asm-ia64/page.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Sun Jan 28 16:33:18 2007 -0700
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Sun Jan 28 16:37:02 2007 -0700
     1.3 @@ -417,12 +417,6 @@ HYPERVISOR_grant_table_op(unsigned int c
     1.4  EXPORT_SYMBOL(HYPERVISOR_grant_table_op);
     1.5  
     1.6  ///////////////////////////////////////////////////////////////////////////
     1.7 -// PageForeign(), SetPageForeign(), ClearPageForeign()
     1.8 -
     1.9 -struct address_space xen_ia64_foreign_dummy_mapping;
    1.10 -EXPORT_SYMBOL(xen_ia64_foreign_dummy_mapping);
    1.11 -
    1.12 -///////////////////////////////////////////////////////////////////////////
    1.13  // foreign mapping
    1.14  #include <linux/efi.h>
    1.15  #include <asm/meminit.h> // for IA64_GRANULE_SIZE, GRANULEROUND{UP,DOWN}()
     2.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h	Sun Jan 28 16:33:18 2007 -0700
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h	Sun Jan 28 16:37:02 2007 -0700
     2.3 @@ -84,9 +84,6 @@ mfn_to_local_pfn(unsigned long mfn)
     2.4  
     2.5  #endif /* !CONFIG_XEN */
     2.6  
     2.7 -/* XXX to compile set_phys_to_machine(vaddr, FOREIGN_FRAME(m)) */
     2.8 -#define FOREIGN_FRAME(m)        (INVALID_P2M_ENTRY)
     2.9 -
    2.10  #define mfn_to_pfn(mfn) (mfn)
    2.11  #define pfn_to_mfn(pfn) (pfn)
    2.12  
     3.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/page.h	Sun Jan 28 16:33:18 2007 -0700
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h	Sun Jan 28 16:37:02 2007 -0700
     3.3 @@ -236,44 +236,6 @@ get_order (unsigned long size)
     3.4  #include <linux/kernel.h>
     3.5  #include <asm/hypervisor.h>
     3.6  #include <xen/features.h>	// to compile netback, netfront
     3.7 -
     3.8 -/*
     3.9 - * XXX hack!
    3.10 - * Linux/IA64 uses PG_arch_1.
    3.11 - * This hack will be removed once PG_foreign bit is taken.
    3.12 - * #include <xen/foreign_page.h>
    3.13 - */
    3.14 -#ifdef __ASM_XEN_FOREIGN_PAGE_H__
    3.15 -# error "don't include include/xen/foreign_page.h!"
    3.16 -#endif
    3.17 -
    3.18 -extern struct address_space xen_ia64_foreign_dummy_mapping;
    3.19 -#define PageForeign(page)	\
    3.20 -	((page)->mapping == &xen_ia64_foreign_dummy_mapping)
    3.21 -
    3.22 -#define SetPageForeign(page, dtor) do {				\
    3.23 -	set_page_private((page), (unsigned long)(dtor));	\
    3.24 -	(page)->mapping = &xen_ia64_foreign_dummy_mapping;	\
    3.25 -	smp_rmb();						\
    3.26 -} while (0)
    3.27 -
    3.28 -#define ClearPageForeign(page) do {	\
    3.29 -	(page)->mapping = NULL;		\
    3.30 -	smp_rmb();			\
    3.31 -	set_page_private((page), 0);	\
    3.32 -} while (0)
    3.33 -
    3.34 -#define PageForeignDestructor(page)	\
    3.35 -	( (void (*) (struct page *)) page_private(page) )
    3.36 -
    3.37 -#define arch_free_page(_page,_order)			\
    3.38 -({      int foreign = PageForeign(_page);               \
    3.39 -	if (foreign)                                    \
    3.40 -		(PageForeignDestructor(_page))(_page);  \
    3.41 -	foreign;                                        \
    3.42 -})
    3.43 -#define HAVE_ARCH_FREE_PAGE
    3.44 -
    3.45  #include <asm/maddr.h>
    3.46  
    3.47  #endif /* CONFIG_XEN */