ia64/xen-unstable

changeset 4764:fa155c185fd6

bitkeeper revision 1.1389.5.13 (42790489SjF8fj4T9jNcZdksbNpR4g)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk
author smh22@firebug.cl.cam.ac.uk
date Wed May 04 17:21:13 2005 +0000 (2005-05-04)
parents 7705c55a6f69 c483f767d98d
children aee6d65586c1 92d76230f6b2
files 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/mkbuildtree	Wed May 04 16:51:22 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/mkbuildtree	Wed May 04 17:21:13 2005 +0000
     1.3 @@ -232,7 +232,6 @@ ln -sf ../../../${LINUX_26}/arch/xen/ker
     1.4  ln -sf ../../../${LINUX_26}/arch/xen/kernel/gnttab.c
     1.5  ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c
     1.6  ln -sf ../../../${LINUX_26}/arch/xen/kernel/skbuff.c
     1.7 -ln -sf ../../../${LINUX_26}/arch/xen/i386/kernel/pci-dma.c
     1.8  
     1.9  cd ${AD}/arch/xen/lib
    1.10  ln -sf ../../i386/lib/checksum.S 
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c	Wed May 04 16:51:22 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c	Wed May 04 17:21:13 2005 +0000
     2.3 @@ -50,6 +50,7 @@
     2.4  #include <asm-xen/xen-public/io/netif.h>
     2.5  #include <asm-xen/balloon.h>
     2.6  #include <asm/page.h>
     2.7 +#include <asm/uaccess.h>
     2.8  
     2.9  #ifndef __GFP_NOWARN
    2.10  #define __GFP_NOWARN 0