bitkeeper revision 1.1479 (428d371brHhQmZxRRggrDJvMfEHd7A)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile

@@ -6,12 +6,12 @@ all: kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
-export-objs     := i386_ksyms.o gnttab.o skbuff.o ctrl_if.o
+export-objs     := i386_ksyms.o skbuff.o ctrl_if.o
 
 obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o  \
 		ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
 		i386_ksyms.o i387.o evtchn.o ctrl_if.o pci-dma.o \
-		reboot.o fixup.o gnttab.o skbuff.o
+		reboot.o fixup.o skbuff.o
 
 ifdef CONFIG_PCI
 obj-y	+= pci-i386.o pci-pc.o

linux-2.4.29-xen-sparse/include/asm-xen/page.h

@@ -77,6 +77,7 @@ static inline unsigned long pte_val(pte_t x)
     if ( (ret & 1) ) ret = machine_to_phys(ret);
     return ret;
 }
+#define pte_val_ma(x)   ((x).pte_low)
 #endif
 #define PTE_MASK	PAGE_MASK
 

linux-2.4.29-xen-sparse/mkbuildtree

@@ -208,7 +208,6 @@ ln -sf ../asm-i386/vm86.h
 ln -sf ../../${LINUX_26}/include/asm-xen/balloon.h
 ln -sf ../../${LINUX_26}/include/asm-xen/ctrl_if.h
 ln -sf ../../${LINUX_26}/include/asm-xen/evtchn.h
-ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h
 ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h
 ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h
 ln -sf ../../${LINUX_26}/include/asm-xen/asm-i386/synch_bitops.h
@@ -229,7 +228,6 @@ ln -sf ../../i386/kernel/sys_i386.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/ctrl_if.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/evtchn.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/fixup.c
-ln -sf ../../../${LINUX_26}/arch/xen/kernel/gnttab.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/skbuff.c
 

linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c

@@ -45,6 +45,7 @@
 #include <net/arp.h>
 #include <net/route.h>
 #include <asm/io.h>
+#include <asm/uaccess.h>
 #include <asm-xen/evtchn.h>
 #include <asm-xen/ctrl_if.h>
 #include <asm-xen/xen-public/io/netif.h>