ia64/xen-unstable

changeset 3031:c4c8868de7cf

bitkeeper revision 1.1159.178.2 (419c79cdpE_zerZG3GhrXcQcFyPFXA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Nov 18 10:30:37 2004 +0000 (2004-11-18)
parents dbf307f6b2ca d7517f43cfda
children 032a1cbbba37 e8a7fc6398af
files linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h linux-2.6.9-xen-sparse/include/linux/gfp.h
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h	Wed Nov 17 22:21:13 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h	Thu Nov 18 10:30:37 2004 +0000
     1.3 @@ -10,10 +10,7 @@
     1.4  #ifndef __ASM_XEN_FOREIGN_PAGE_H__
     1.5  #define __ASM_XEN_FOREIGN_PAGE_H__
     1.6  
     1.7 -/*
     1.8 - * NOTE: PG_foreign must not conflict with any PG_ definition in page-flags.h!!
     1.9 - */
    1.10 -#define PG_foreign		25
    1.11 +#define PG_foreign		PG_arch_1
    1.12  
    1.13  #define PageForeign(page)	test_bit(PG_foreign, &(page)->flags)
    1.14  
     2.1 --- a/linux-2.6.9-xen-sparse/include/linux/gfp.h	Wed Nov 17 22:21:13 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/include/linux/gfp.h	Thu Nov 18 10:30:37 2004 +0000
     2.3 @@ -79,11 +79,7 @@ struct vm_area_struct;
     2.4   * immediately bail: the arch-specific function has done all the work.
     2.5   */
     2.6  #ifndef HAVE_ARCH_FREE_PAGE
     2.7 -static inline int arch_free_page(struct page *page, int order)
     2.8 -{
     2.9 -	/* Generic free_page must do the work. */
    2.10 -	return 0;
    2.11 -}
    2.12 +#define arch_free_page(page, order) 0
    2.13  #endif
    2.14  
    2.15  extern struct page *