ia64/xen-unstable

changeset 3989:50e01d9d33a7

bitkeeper revision 1.1236.10.1 (42288860WihptaT0mMRS7KBmfxWFcA)

build fixes

Signed-off-by: steven.hand@cl.cam.ac.uk
author smh22@tempest.cl.cam.ac.uk
date Fri Mar 04 16:10:08 2005 +0000 (2005-03-04)
parents 807238e9d9f4
children 27179d82f20d
files BitKeeper/etc/ignore linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c
line diff
     1.1 --- a/BitKeeper/etc/ignore	Fri Mar 04 09:13:42 2005 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Fri Mar 04 16:10:08 2005 +0000
     1.3 @@ -101,3 +101,52 @@ xen/tools/figlet/figlet
     1.4  xen/xen
     1.5  xen/xen-syms
     1.6  xen/xen.*
     1.7 +linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh
     1.8 +tools/Makefile.smh
     1.9 +tools/blktap/Makefile.smh
    1.10 +tools/blktap/blkcow
    1.11 +tools/blktap/blkcowgnbd
    1.12 +tools/blktap/blkcowimg
    1.13 +tools/blktap/blkdump
    1.14 +tools/blktap/blkgnbd
    1.15 +tools/blktap/blkimg
    1.16 +tools/blktap/blockstore.dat
    1.17 +tools/blktap/parallax
    1.18 +tools/blktap/vdi.dot
    1.19 +tools/blktap/vdi.ps
    1.20 +tools/blktap/vdi_create
    1.21 +tools/blktap/vdi_fill
    1.22 +tools/blktap/vdi_list
    1.23 +tools/blktap/vdi_snap
    1.24 +tools/blktap/vdi_snap_list
    1.25 +tools/blktap/vdi_tree
    1.26 +tools/blktap/vdi_validate
    1.27 +tools/blktap/xen/arch-ia64.h
    1.28 +tools/blktap/xen/arch-x86_32.h
    1.29 +tools/blktap/xen/arch-x86_64.h
    1.30 +tools/blktap/xen/dom0_ops.h
    1.31 +tools/blktap/xen/event_channel.h
    1.32 +tools/blktap/xen/grant_table.h
    1.33 +tools/blktap/xen/io/blkif.h
    1.34 +tools/blktap/xen/io/domain_controller.h
    1.35 +tools/blktap/xen/io/ioreq.h
    1.36 +tools/blktap/xen/io/netif.h
    1.37 +tools/blktap/xen/io/ring.h
    1.38 +tools/blktap/xen/io/usbif.h
    1.39 +tools/blktap/xen/linux/privcmd.h
    1.40 +tools/blktap/xen/linux/suspend.h
    1.41 +tools/blktap/xen/physdev.h
    1.42 +tools/blktap/xen/sched_ctl.h
    1.43 +tools/blktap/xen/trace.h
    1.44 +tools/blktap/xen/xen.h
    1.45 +tools/cmdline/Makefile
    1.46 +tools/cmdline/ringbuster
    1.47 +tools/cmdline/ringbuster.c
    1.48 +tools/cmdline/xdestroy
    1.49 +tools/cmdline/xdestroy.c
    1.50 +tools/cmdline/xevtchn
    1.51 +tools/cmdline/xevtchn.c
    1.52 +tools/cmdline/xls
    1.53 +tools/cmdline/xls.c
    1.54 +tools/cmdline/xphysinfo
    1.55 +tools/cmdline/xphysinfo.c
     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c	Fri Mar 04 09:13:42 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c	Fri Mar 04 16:10:08 2005 +0000
     2.3 @@ -14,6 +14,10 @@
     2.4  #include <asm-xen/balloon.h>
     2.5  #include <asm-xen/evtchn.h>
     2.6  
     2.7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
     2.8 +#include <linux/delay.h>
     2.9 +#endif
    2.10 +
    2.11  static void netif_idx_release(u16 pending_idx);
    2.12  static void netif_page_release(struct page *page);
    2.13  static void make_tx_response(netif_t *netif, 
    2.14 @@ -500,7 +504,11 @@ static void net_tx_action(unsigned long 
    2.15                  netif->credit_timeout.expires  = next_credit;
    2.16                  netif->credit_timeout.data     = (unsigned long)netif;
    2.17                  netif->credit_timeout.function = tx_credit_callback;
    2.18 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    2.19                  add_timer_on(&netif->credit_timeout, smp_processor_id());
    2.20 +#else
    2.21 +                add_timer(&netif->credit_timeout); 
    2.22 +#endif
    2.23                  break;
    2.24              }
    2.25          }