ia64/xen-unstable

changeset 3032:032a1cbbba37

bitkeeper revision 1.1159.170.44 (419ca014UOzabKYzMFeVLxcsT6vGFg)

Merge br260@labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno.bk
into anvil.research:/scratch/anvil/bren/xeno.bk
author bren@anvil.research
date Thu Nov 18 13:13:56 2004 +0000 (2004-11-18)
parents 401d110b812b c4c8868de7cf
children 877279a4160b
files buildconfigs/Rules.mk 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/buildconfigs/Rules.mk	Wed Nov 17 16:17:05 2004 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Thu Nov 18 13:13:56 2004 +0000
     1.3 @@ -1,3 +1,8 @@
     1.4 +
     1.5 +# We expect these two to already be set if people 
     1.6 +# are using the top-level Makefile
     1.7 +DIST_DIR	?= $(shell pwd)/dist
     1.8 +INSTALL_DIR	?= $(DIST_DIR)/install
     1.9  
    1.10  .PHONY:	mkpatches mrproper
    1.11  
     2.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h	Wed Nov 17 16:17:05 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/foreign_page.h	Thu Nov 18 13:13:56 2004 +0000
     2.3 @@ -10,10 +10,7 @@
     2.4  #ifndef __ASM_XEN_FOREIGN_PAGE_H__
     2.5  #define __ASM_XEN_FOREIGN_PAGE_H__
     2.6  
     2.7 -/*
     2.8 - * NOTE: PG_foreign must not conflict with any PG_ definition in page-flags.h!!
     2.9 - */
    2.10 -#define PG_foreign		25
    2.11 +#define PG_foreign		PG_arch_1
    2.12  
    2.13  #define PageForeign(page)	test_bit(PG_foreign, &(page)->flags)
    2.14  
     3.1 --- a/linux-2.6.9-xen-sparse/include/linux/gfp.h	Wed Nov 17 16:17:05 2004 +0000
     3.2 +++ b/linux-2.6.9-xen-sparse/include/linux/gfp.h	Thu Nov 18 13:13:56 2004 +0000
     3.3 @@ -79,11 +79,7 @@ struct vm_area_struct;
     3.4   * immediately bail: the arch-specific function has done all the work.
     3.5   */
     3.6  #ifndef HAVE_ARCH_FREE_PAGE
     3.7 -static inline int arch_free_page(struct page *page, int order)
     3.8 -{
     3.9 -	/* Generic free_page must do the work. */
    3.10 -	return 0;
    3.11 -}
    3.12 +#define arch_free_page(page, order) 0
    3.13  #endif
    3.14  
    3.15  extern struct page *