ia64/xen-unstable

changeset 5032:c327de10c6d1

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
author iap10@freefall.cl.cam.ac.uk
date Fri May 20 01:02:19 2005 +0000 (2005-05-20)
parents ca1dfb92b19d 829173784dc1
children 9463ebcafca0
files linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile linux-2.4.29-xen-sparse/include/asm-xen/page.h linux-2.4.29-xen-sparse/mkbuildtree linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile	Thu May 19 22:10:46 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile	Fri May 20 01:02:19 2005 +0000
     1.3 @@ -6,12 +6,12 @@ all: kernel.o head.o init_task.o
     1.4  
     1.5  O_TARGET := kernel.o
     1.6  
     1.7 -export-objs     := i386_ksyms.o gnttab.o skbuff.o ctrl_if.o
     1.8 +export-objs     := i386_ksyms.o skbuff.o ctrl_if.o
     1.9  
    1.10  obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o  \
    1.11  		ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
    1.12  		i386_ksyms.o i387.o evtchn.o ctrl_if.o pci-dma.o \
    1.13 -		reboot.o fixup.o gnttab.o skbuff.o
    1.14 +		reboot.o fixup.o skbuff.o
    1.15  
    1.16  ifdef CONFIG_PCI
    1.17  obj-y	+= pci-i386.o pci-pc.o
     2.1 --- a/linux-2.4.29-xen-sparse/include/asm-xen/page.h	Thu May 19 22:10:46 2005 +0000
     2.2 +++ b/linux-2.4.29-xen-sparse/include/asm-xen/page.h	Fri May 20 01:02:19 2005 +0000
     2.3 @@ -77,6 +77,7 @@ static inline unsigned long pte_val(pte_
     2.4      if ( (ret & 1) ) ret = machine_to_phys(ret);
     2.5      return ret;
     2.6  }
     2.7 +#define pte_val_ma(x)   ((x).pte_low)
     2.8  #endif
     2.9  #define PTE_MASK	PAGE_MASK
    2.10  
     3.1 --- a/linux-2.4.29-xen-sparse/mkbuildtree	Thu May 19 22:10:46 2005 +0000
     3.2 +++ b/linux-2.4.29-xen-sparse/mkbuildtree	Fri May 20 01:02:19 2005 +0000
     3.3 @@ -208,7 +208,6 @@ ln -sf ../asm-i386/vm86.h
     3.4  ln -sf ../../${LINUX_26}/include/asm-xen/balloon.h
     3.5  ln -sf ../../${LINUX_26}/include/asm-xen/ctrl_if.h
     3.6  ln -sf ../../${LINUX_26}/include/asm-xen/evtchn.h
     3.7 -ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h
     3.8  ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h
     3.9  ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h
    3.10  ln -sf ../../${LINUX_26}/include/asm-xen/asm-i386/synch_bitops.h
    3.11 @@ -229,7 +228,6 @@ ln -sf ../../i386/kernel/sys_i386.c
    3.12  ln -sf ../../../${LINUX_26}/arch/xen/kernel/ctrl_if.c
    3.13  ln -sf ../../../${LINUX_26}/arch/xen/kernel/evtchn.c
    3.14  ln -sf ../../../${LINUX_26}/arch/xen/kernel/fixup.c
    3.15 -ln -sf ../../../${LINUX_26}/arch/xen/kernel/gnttab.c
    3.16  ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c
    3.17  ln -sf ../../../${LINUX_26}/arch/xen/kernel/skbuff.c
    3.18  
     4.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c	Thu May 19 22:10:46 2005 +0000
     4.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c	Fri May 20 01:02:19 2005 +0000
     4.3 @@ -45,6 +45,7 @@
     4.4  #include <net/arp.h>
     4.5  #include <net/route.h>
     4.6  #include <asm/io.h>
     4.7 +#include <asm/uaccess.h>
     4.8  #include <asm-xen/evtchn.h>
     4.9  #include <asm-xen/ctrl_if.h>
    4.10  #include <asm-xen/xen-public/io/netif.h>