ia64/xen-unstable

changeset 1155:890460f07ddf

bitkeeper revision 1.775 (404f3d312IPf2eSF1VGO0WBwqhqeaA)

trace.h:
new file
Many files:
Fix compile errors in Xen headers.
author kaf24@scramble.cl.cam.ac.uk
date Wed Mar 10 16:07:13 2004 +0000 (2004-03-10)
parents ffcfa91cf6bc
children 1d090ba93630
files .rootkeys tools/examples/Makefile tools/misc/Makefile tools/xc/lib/Makefile tools/xc/lib/xc_private.h tools/xentrace/Makefile tools/xentrace/xentrace.c xen/Makefile xen/arch/i386/extable.c xen/arch/i386/nmi.c xen/arch/i386/pci-dma.c xen/arch/i386/pci-i386.c xen/arch/i386/pci-irq.c xen/arch/i386/pci-pc.c xen/arch/i386/usercopy.c xen/common/brlock.c xen/common/kernel.c xen/common/network.c xen/common/resource.c xen/common/string.c xen/common/timer.c xen/drivers/block/cciss.h xen/drivers/block/cciss_scsi.c xen/drivers/char/keyboard.c xen/drivers/ide/ide-pci.c xen/drivers/ide/ide_modes.h xen/drivers/ide/piix.c xen/drivers/message/fusion/isense.h xen/drivers/message/fusion/linux_compat.h xen/drivers/message/fusion/mptbase.h xen/drivers/message/fusion/mptscsih.h xen/drivers/message/fusion/scsi3.h xen/drivers/net/3c59x.c xen/drivers/net/8139too.c xen/drivers/net/Space.c xen/drivers/net/e100/e100.h xen/drivers/net/e100/e100_config.c xen/drivers/net/e100/e100_config.h xen/drivers/net/e100/e100_eeprom.c xen/drivers/net/e100/e100_main.c xen/drivers/net/e100/e100_phy.c xen/drivers/net/e100/e100_phy.h xen/drivers/net/e100/e100_test.c xen/drivers/net/e100/e100_ucode.h xen/drivers/net/e1000/e1000.h xen/drivers/net/e1000/e1000_ethtool.c xen/drivers/net/e1000/e1000_hw.c xen/drivers/net/e1000/e1000_hw.h xen/drivers/net/e1000/e1000_main.c xen/drivers/net/e1000/e1000_osdep.h xen/drivers/net/e1000/e1000_param.c xen/drivers/net/e1000/kcompat.c xen/drivers/net/e1000/kcompat.h xen/drivers/net/net_init.c xen/drivers/net/pcnet32.c xen/drivers/net/setup.c xen/drivers/net/tg3.c xen/drivers/net/tulip/21142.c xen/drivers/net/tulip/eeprom.c xen/drivers/net/tulip/interrupt.c xen/drivers/net/tulip/media.c xen/drivers/net/tulip/pnic.c xen/drivers/net/tulip/pnic2.c xen/drivers/net/tulip/tulip.h xen/drivers/net/tulip/tulip_core.c xen/drivers/pci/compat.c xen/drivers/pci/names.c xen/drivers/pci/pci.c xen/drivers/pci/proc.c xen/drivers/pci/quirks.c xen/drivers/pci/setup-bus.c xen/drivers/pci/setup-irq.c xen/drivers/pci/setup-res.c xen/drivers/pci/syscall.c xen/drivers/scsi/BusLogic.c xen/drivers/scsi/BusLogic.h xen/drivers/scsi/FlashPoint.c.inc xen/drivers/scsi/aacraid/aachba.c xen/drivers/scsi/aacraid/commctrl.c xen/drivers/scsi/aacraid/comminit.c xen/drivers/scsi/aacraid/commsup.c xen/drivers/scsi/aacraid/dpcsup.c xen/drivers/scsi/aacraid/linit.c xen/drivers/scsi/aacraid/rx.c xen/drivers/scsi/aacraid/sa.c xen/drivers/scsi/constants.c xen/drivers/scsi/scsi_dma.c xen/drivers/scsi/scsi_ioctl.c xen/drivers/scsi/scsi_module.c.inc xen/drivers/scsi/scsi_obsolete.c xen/drivers/scsi/scsi_scan.c xen/drivers/scsi/scsicam.c xen/drivers/scsi/sym53c8xx_2/sym_glue.c xen/include/asm-i386/apic.h xen/include/asm-i386/byteorder.h xen/include/asm-i386/dma.h xen/include/asm-i386/ide.h xen/include/asm-i386/io.h xen/include/asm-i386/pci.h xen/include/asm-i386/string.h xen/include/asm-i386/timex.h xen/include/asm-i386/uaccess.h xen/include/asm-x86_64/apic.h xen/include/asm-x86_64/byteorder.h xen/include/asm-x86_64/dma.h xen/include/asm-x86_64/ide.h xen/include/asm-x86_64/io.h xen/include/asm-x86_64/page.h xen/include/asm-x86_64/pci.h xen/include/asm-x86_64/pda.h xen/include/asm-x86_64/timex.h xen/include/asm-x86_64/uaccess.h xen/include/hypervisor-ifs/trace.h xen/include/xeno/brlock.h xen/include/xeno/byteorder/big_endian.h xen/include/xeno/byteorder/little_endian.h xen/include/xeno/byteorder/pdp_endian.h xen/include/xeno/cdrom.h xen/include/xeno/crc32.h xen/include/xeno/etherdevice.h xen/include/xeno/genhd.h xen/include/xeno/hdreg.h xen/include/xeno/if.h xen/include/xeno/if_vlan.h xen/include/xeno/init.h xen/include/xeno/interrupt.h xen/include/xeno/mii.h xen/include/xeno/module.h xen/include/xeno/notifier.h xen/include/xeno/pci.h xen/include/xeno/reboot.h xen/include/xeno/skbuff.h xen/include/xeno/socket.h xen/include/xeno/spinlock.h xen/include/xeno/string.h xen/include/xeno/timer.h xen/include/xeno/tqueue.h xen/include/xeno/trace.h xen/net/dev.c xen/net/dev_mcast.c xen/net/devinit.c xen/net/eth.c xen/net/skbuff.c
line diff
     1.1 --- a/.rootkeys	Wed Mar 10 14:41:38 2004 +0000
     1.2 +++ b/.rootkeys	Wed Mar 10 16:07:13 2004 +0000
     1.3 @@ -479,6 +479,7 @@ 403cd194j2pyLqXD8FJ-ukvZzkPenw xen/inclu
     1.4  3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/hypervisor-ifs/hypervisor-if.h
     1.5  3ead095dE_VF-QA88rl_5cWYRWtRVQ xen/include/hypervisor-ifs/kbd.h
     1.6  3ddb79c2oRPrzClk3zbTkRHlpumzKA xen/include/hypervisor-ifs/network.h
     1.7 +404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/include/hypervisor-ifs/trace.h
     1.8  3f0d22cbroqp_BkoDPwkfRJhaw1LiQ xen/include/hypervisor-ifs/vbd.h
     1.9  3ddb79c4qbCoOFHrv9sCGshbWzBVlQ xen/include/scsi/scsi.h
    1.10  3ddb79c4R4iVwqIIeychVQYmIH4FUg xen/include/scsi/scsi_ioctl.h
     2.1 --- a/tools/examples/Makefile	Wed Mar 10 14:41:38 2004 +0000
     2.2 +++ b/tools/examples/Makefile	Wed Mar 10 16:07:13 2004 +0000
     2.3 @@ -1,11 +1,3 @@
     2.4 -
     2.5 -CC        = gcc
     2.6 -CFLAGS    = -Wall -O3 
     2.7 -EXTRA_INC = -I../../xen/include -I../../xenolinux-sparse/include -I../xc/lib
     2.8 -
     2.9 -HDRS     = $(wildcard *.h)
    2.10 -SRCS     = $(wildcard *.c)
    2.11 -OBJS     = $(patsubst %.c,%.o,$(SRCS))
    2.12  
    2.13  INSTALL  = $(wildcard *.py)
    2.14  ETC	 = defaults democd netbsd
    2.15 @@ -32,8 +24,3 @@ dist: all
    2.16  	install --mode=555 $(INITD) ../../../install/init.d
    2.17  
    2.18  clean:
    2.19 -
    2.20 -
    2.21 -%: %.c $(HDRS) Makefile
    2.22 -	$(CC) $(CFLAGS) $(EXTRA_INC) -o $@ $<
    2.23 -
     3.1 --- a/tools/misc/Makefile	Wed Mar 10 14:41:38 2004 +0000
     3.2 +++ b/tools/misc/Makefile	Wed Mar 10 16:07:13 2004 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4 -
     3.5 -CC        = gcc
     3.6 -CFLAGS    = -Wall -O3 
     3.7 -EXTRA_INC = -I../../xen/include -I../../xenolinux-sparse/include -I../xc/lib
     3.8 +CC         = gcc
     3.9 +CFLAGS     = -Wall -O3 
    3.10 +EXTRA_INC  = -I../../xen/include/hypervisor-ifs
    3.11 +EXTRA_INC += -I../../xenolinux-sparse/include -I../xc/lib
    3.12  
    3.13  HDRS     = $(wildcard *.h)
    3.14  SRCS     = $(wildcard *.c)
     4.1 --- a/tools/xc/lib/Makefile	Wed Mar 10 14:41:38 2004 +0000
     4.2 +++ b/tools/xc/lib/Makefile	Wed Mar 10 16:07:13 2004 +0000
     4.3 @@ -5,7 +5,8 @@ SONAME   = libxc.so.$(MAJOR)
     4.4  
     4.5  CC       = gcc
     4.6  CFLAGS   = -c -Wall -O3 
     4.7 -CFLAGS  += -I../../../xen/include -I../../../xenolinux-sparse/include
     4.8 +CFLAGS  += -I../../../xen/include/hypervisor-ifs
     4.9 +CFLAGS  += -I../../../xenolinux-sparse/include
    4.10  
    4.11  HDRS     = $(wildcard *.h)
    4.12  OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
     5.1 --- a/tools/xc/lib/xc_private.h	Wed Mar 10 14:41:38 2004 +0000
     5.2 +++ b/tools/xc/lib/xc_private.h	Wed Mar 10 16:07:13 2004 +0000
     5.3 @@ -17,10 +17,12 @@
     5.4  #include "xc.h"
     5.5  
     5.6  #include <asm-xeno/proc_cmd.h>
     5.7 -#include <hypervisor-ifs/hypervisor-if.h>
     5.8 -#include <hypervisor-ifs/dom0_ops.h>
     5.9 -#include <hypervisor-ifs/vbd.h>
    5.10 -#include <hypervisor-ifs/event_channel.h>
    5.11 +
    5.12 +/* from xen/include/hypervisor-ifs */
    5.13 +#include <hypervisor-if.h>
    5.14 +#include <dom0_ops.h>
    5.15 +#include <vbd.h>
    5.16 +#include <event_channel.h>
    5.17  
    5.18  #define _PAGE_PRESENT   0x001
    5.19  #define _PAGE_RW        0x002
     6.1 --- a/tools/xentrace/Makefile	Wed Mar 10 14:41:38 2004 +0000
     6.2 +++ b/tools/xentrace/Makefile	Wed Mar 10 16:07:13 2004 +0000
     6.3 @@ -1,7 +1,8 @@
     6.4  
     6.5  CC       = gcc
     6.6  CFLAGS   = -Wall -O3 
     6.7 -CFLAGS  += -I../../xen/include -I../../xenolinux-sparse/include
     6.8 +CFLAGS  += -I../../xen/include/hypervisor-ifs
     6.9 +CFLAGS  += -I../../xenolinux-sparse/include
    6.10  
    6.11  HDRS     = $(wildcard *.h)
    6.12  OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
     7.1 --- a/tools/xentrace/xentrace.c	Wed Mar 10 14:41:38 2004 +0000
     7.2 +++ b/tools/xentrace/xentrace.c	Wed Mar 10 16:07:13 2004 +0000
     7.3 @@ -23,7 +23,8 @@
     7.4  
     7.5  #include "../xc/lib/xc_private.h"
     7.6  
     7.7 -#include <xeno/trace.h>
     7.8 +/* from xen/include/hypervisor-ifs */
     7.9 +#include <trace.h>
    7.10  
    7.11  extern FILE *stdout;
    7.12  
     8.1 --- a/xen/Makefile	Wed Mar 10 14:41:38 2004 +0000
     8.2 +++ b/xen/Makefile	Wed Mar 10 16:07:13 2004 +0000
     8.3 @@ -43,12 +43,11 @@ clean: delete-links
     8.4  	$(MAKE) -C arch/$(ARCH)
     8.5  
     8.6  make-links: delete-links
     8.7 -	ln -sf xeno include/linux
     8.8  	ln -sf asm-$(ARCH) include/asm
     8.9  	ln -sf arch-$(ARCH) include/hypervisor-ifs/arch
    8.10  
    8.11  delete-links:
    8.12 -	rm -f include/linux include/asm include/hypervisor-ifs/arch
    8.13 +	rm -f include/asm include/hypervisor-ifs/arch
    8.14  
    8.15  # Blow away kernel.o because build info is stored statically within it.
    8.16  delete-unfresh-files:
     9.1 --- a/xen/arch/i386/extable.c	Wed Mar 10 14:41:38 2004 +0000
     9.2 +++ b/xen/arch/i386/extable.c	Wed Mar 10 16:07:13 2004 +0000
     9.3 @@ -2,9 +2,9 @@
     9.4   * linux/arch/i386/mm/extable.c
     9.5   */
     9.6  
     9.7 -#include <linux/config.h>
     9.8 -#include <linux/module.h>
     9.9 -#include <linux/spinlock.h>
    9.10 +#include <xeno/config.h>
    9.11 +#include <xeno/module.h>
    9.12 +#include <xeno/spinlock.h>
    9.13  #include <asm/uaccess.h>
    9.14  
    9.15  extern const struct exception_table_entry __start___ex_table[];
    10.1 --- a/xen/arch/i386/nmi.c	Wed Mar 10 14:41:38 2004 +0000
    10.2 +++ b/xen/arch/i386/nmi.c	Wed Mar 10 16:07:13 2004 +0000
    10.3 @@ -12,16 +12,16 @@
    10.4   *  Keir Fraser         : Pentium 4 Hyperthreading support
    10.5   */
    10.6  
    10.7 -#include <linux/config.h>
    10.8 -#include <linux/init.h>
    10.9 -#include <linux/lib.h>
   10.10 -#include <linux/mm.h>
   10.11 -#include <linux/irq.h>
   10.12 -#include <linux/delay.h>
   10.13 -#include <linux/interrupt.h>
   10.14 -#include <linux/time.h>
   10.15 -#include <linux/timex.h>
   10.16 -#include <linux/sched.h>
   10.17 +#include <xeno/config.h>
   10.18 +#include <xeno/init.h>
   10.19 +#include <xeno/lib.h>
   10.20 +#include <xeno/mm.h>
   10.21 +#include <xeno/irq.h>
   10.22 +#include <xeno/delay.h>
   10.23 +#include <xeno/interrupt.h>
   10.24 +#include <xeno/time.h>
   10.25 +#include <xeno/timex.h>
   10.26 +#include <xeno/sched.h>
   10.27  
   10.28  #include <asm/mc146818rtc.h>
   10.29  #include <asm/smp.h>
    11.1 --- a/xen/arch/i386/pci-dma.c	Wed Mar 10 14:41:38 2004 +0000
    11.2 +++ b/xen/arch/i386/pci-dma.c	Wed Mar 10 16:07:13 2004 +0000
    11.3 @@ -7,10 +7,10 @@
    11.4   * in asm/pci.h.
    11.5   */
    11.6  
    11.7 -#include <linux/types.h>
    11.8 -#include <linux/mm.h>
    11.9 -#include <linux/lib.h>
   11.10 -#include <linux/pci.h>
   11.11 +#include <xeno/types.h>
   11.12 +#include <xeno/mm.h>
   11.13 +#include <xeno/lib.h>
   11.14 +#include <xeno/pci.h>
   11.15  #include <asm/io.h>
   11.16  
   11.17  void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
    12.1 --- a/xen/arch/i386/pci-i386.c	Wed Mar 10 14:41:38 2004 +0000
    12.2 +++ b/xen/arch/i386/pci-i386.c	Wed Mar 10 16:07:13 2004 +0000
    12.3 @@ -85,12 +85,12 @@
    12.4   * Oct  8, 1999 : Split to pci-i386.c, pci-pc.c and pci-visws.c. [mj]
    12.5   */
    12.6  
    12.7 -#include <linux/types.h>
    12.8 -#include <linux/lib.h>
    12.9 -#include <linux/pci.h>
   12.10 -#include <linux/init.h>
   12.11 -#include <linux/ioport.h>
   12.12 -#include <linux/errno.h>
   12.13 +#include <xeno/types.h>
   12.14 +#include <xeno/lib.h>
   12.15 +#include <xeno/pci.h>
   12.16 +#include <xeno/init.h>
   12.17 +#include <xeno/ioport.h>
   12.18 +#include <xeno/errno.h>
   12.19  
   12.20  #include "pci-i386.h"
   12.21  
    13.1 --- a/xen/arch/i386/pci-irq.c	Wed Mar 10 14:41:38 2004 +0000
    13.2 +++ b/xen/arch/i386/pci-irq.c	Wed Mar 10 16:07:13 2004 +0000
    13.3 @@ -4,14 +4,14 @@
    13.4   *	(c) 1999--2000 Martin Mares <mj@ucw.cz>
    13.5   */
    13.6  
    13.7 -#include <linux/config.h>
    13.8 -#include <linux/types.h>
    13.9 -#include <linux/pci.h>
   13.10 -#include <linux/init.h>
   13.11 -#include <linux/slab.h>
   13.12 -#include <linux/interrupt.h>
   13.13 -#include <linux/irq.h>
   13.14 -#include <linux/sched.h>
   13.15 +#include <xeno/config.h>
   13.16 +#include <xeno/types.h>
   13.17 +#include <xeno/pci.h>
   13.18 +#include <xeno/init.h>
   13.19 +#include <xeno/slab.h>
   13.20 +#include <xeno/interrupt.h>
   13.21 +#include <xeno/irq.h>
   13.22 +#include <xeno/sched.h>
   13.23  #include <asm/io.h>
   13.24  #include <asm/smp.h>
   13.25  #include <asm/mpspec.h>
    14.1 --- a/xen/arch/i386/pci-pc.c	Wed Mar 10 14:41:38 2004 +0000
    14.2 +++ b/xen/arch/i386/pci-pc.c	Wed Mar 10 16:07:13 2004 +0000
    14.3 @@ -4,13 +4,13 @@
    14.4   *	(c) 1999--2000 Martin Mares <mj@ucw.cz>
    14.5   */
    14.6  
    14.7 -#include <linux/config.h>
    14.8 -#include <linux/types.h>
    14.9 -/*#include <linux/kernel.h>*/
   14.10 -#include <linux/sched.h>
   14.11 -#include <linux/pci.h>
   14.12 -#include <linux/init.h>
   14.13 -#include <linux/ioport.h>
   14.14 +#include <xeno/config.h>
   14.15 +#include <xeno/types.h>
   14.16 +/*#include <xeno/kernel.h>*/
   14.17 +#include <xeno/sched.h>
   14.18 +#include <xeno/pci.h>
   14.19 +#include <xeno/init.h>
   14.20 +#include <xeno/ioport.h>
   14.21  
   14.22  /*#include <asm/segment.h>*/
   14.23  #include <asm/io.h>
    15.1 --- a/xen/arch/i386/usercopy.c	Wed Mar 10 14:41:38 2004 +0000
    15.2 +++ b/xen/arch/i386/usercopy.c	Wed Mar 10 16:07:13 2004 +0000
    15.3 @@ -5,7 +5,7 @@
    15.4   * Copyright 1997 Andi Kleen <ak@muc.de>
    15.5   * Copyright 1997 Linus Torvalds
    15.6   */
    15.7 -#include <linux/config.h>
    15.8 +#include <xeno/config.h>
    15.9  #include <asm/uaccess.h>
   15.10  //#include <asm/mmx.h>
   15.11  
    16.1 --- a/xen/common/brlock.c	Wed Mar 10 14:41:38 2004 +0000
    16.2 +++ b/xen/common/brlock.c	Wed Mar 10 16:07:13 2004 +0000
    16.3 @@ -8,12 +8,12 @@
    16.4   * Copyright 2000, David S. Miller <davem@redhat.com>
    16.5   */
    16.6  
    16.7 -#include <linux/config.h>
    16.8 +#include <xeno/config.h>
    16.9  
   16.10  #ifdef CONFIG_SMP
   16.11  
   16.12 -#include <linux/sched.h>
   16.13 -#include <linux/brlock.h>
   16.14 +#include <xeno/sched.h>
   16.15 +#include <xeno/brlock.h>
   16.16  
   16.17  #ifdef __BRLOCK_USE_ATOMICS
   16.18  
    17.1 --- a/xen/common/kernel.c	Wed Mar 10 14:41:38 2004 +0000
    17.2 +++ b/xen/common/kernel.c	Wed Mar 10 16:07:13 2004 +0000
    17.3 @@ -26,7 +26,7 @@
    17.4  #include <asm/uaccess.h>
    17.5  #include <hypervisor-ifs/dom0_ops.h>
    17.6  #include <asm/byteorder.h>
    17.7 -#include <linux/if_ether.h>
    17.8 +#include <xeno/if_ether.h>
    17.9  #include <asm/domain_page.h>
   17.10  #include <xeno/console.h>
   17.11  #include <xeno/net_headers.h>
    18.1 --- a/xen/common/network.c	Wed Mar 10 14:41:38 2004 +0000
    18.2 +++ b/xen/common/network.c	Wed Mar 10 16:07:13 2004 +0000
    18.3 @@ -29,7 +29,7 @@
    18.4  #include <xeno/slab.h>
    18.5  #include <xeno/spinlock.h>
    18.6  #include <xeno/if_ether.h>
    18.7 -#include <linux/skbuff.h>
    18.8 +#include <xeno/skbuff.h>
    18.9  #include <xeno/netdevice.h>
   18.10  #include <xeno/in.h>
   18.11  #include <asm/domain_page.h>
    19.1 --- a/xen/common/resource.c	Wed Mar 10 14:41:38 2004 +0000
    19.2 +++ b/xen/common/resource.c	Wed Mar 10 16:07:13 2004 +0000
    19.3 @@ -7,14 +7,14 @@
    19.4   * Arbitrary resource management.
    19.5   */
    19.6  
    19.7 -#include <linux/config.h>
    19.8 -#include <linux/lib.h>
    19.9 -#include <linux/sched.h>
   19.10 -#include <linux/errno.h>
   19.11 -#include <linux/ioport.h>
   19.12 -#include <linux/init.h>
   19.13 -#include <linux/slab.h>
   19.14 -#include <linux/spinlock.h>
   19.15 +#include <xeno/config.h>
   19.16 +#include <xeno/lib.h>
   19.17 +#include <xeno/sched.h>
   19.18 +#include <xeno/errno.h>
   19.19 +#include <xeno/ioport.h>
   19.20 +#include <xeno/init.h>
   19.21 +#include <xeno/slab.h>
   19.22 +#include <xeno/spinlock.h>
   19.23  #include <asm/io.h>
   19.24  
   19.25  struct resource ioport_resource = { "PCI IO", 0x0000, IO_SPACE_LIMIT, IORESOURCE_IO };
    20.1 --- a/xen/common/string.c	Wed Mar 10 14:41:38 2004 +0000
    20.2 +++ b/xen/common/string.c	Wed Mar 10 16:07:13 2004 +0000
    20.3 @@ -15,9 +15,9 @@
    20.4   *    reentrant and should be faster). Use only strsep() in new code, please.
    20.5   */
    20.6   
    20.7 -#include <linux/types.h>
    20.8 -#include <linux/string.h>
    20.9 -#include <linux/ctype.h>
   20.10 +#include <xeno/types.h>
   20.11 +#include <xeno/string.h>
   20.12 +#include <xeno/ctype.h>
   20.13  
   20.14  #ifndef __HAVE_ARCH_STRNICMP
   20.15  /**
    21.1 --- a/xen/common/timer.c	Wed Mar 10 14:41:38 2004 +0000
    21.2 +++ b/xen/common/timer.c	Wed Mar 10 16:07:13 2004 +0000
    21.3 @@ -15,14 +15,14 @@
    21.4   *  1999-03-10  Improved NTP compatibility by Ulrich Windl
    21.5   */
    21.6  
    21.7 -#include <linux/config.h>
    21.8 -#include <linux/mm.h>
    21.9 -#include <linux/time.h>
   21.10 -#include <linux/timer.h>
   21.11 -#include <linux/timex.h>
   21.12 -#include <linux/tqueue.h>
   21.13 -#include <linux/delay.h>
   21.14 -#include <linux/interrupt.h>
   21.15 +#include <xeno/config.h>
   21.16 +#include <xeno/mm.h>
   21.17 +#include <xeno/time.h>
   21.18 +#include <xeno/timer.h>
   21.19 +#include <xeno/timex.h>
   21.20 +#include <xeno/tqueue.h>
   21.21 +#include <xeno/delay.h>
   21.22 +#include <xeno/interrupt.h>
   21.23  
   21.24  #include <xeno/event.h>
   21.25  
    22.1 --- a/xen/drivers/block/cciss.h	Wed Mar 10 14:41:38 2004 +0000
    22.2 +++ b/xen/drivers/block/cciss.h	Wed Mar 10 16:07:13 2004 +0000
    22.3 @@ -1,7 +1,7 @@
    22.4  #ifndef CCISS_H
    22.5  #define CCISS_H
    22.6  
    22.7 -#include <linux/genhd.h>
    22.8 +#include <xeno/genhd.h>
    22.9  
   22.10  #include "cciss_cmd.h"
   22.11  
    23.1 --- a/xen/drivers/block/cciss_scsi.c	Wed Mar 10 14:41:38 2004 +0000
    23.2 +++ b/xen/drivers/block/cciss_scsi.c	Wed Mar 10 16:07:13 2004 +0000
    23.3 @@ -31,7 +31,7 @@
    23.4  #include "../scsi/scsi.h"
    23.5  #include "../scsi/hosts.h"
    23.6  #include <asm/atomic.h>
    23.7 -#include <linux/timer.h>
    23.8 +#include <xeno/timer.h>
    23.9  
   23.10  #include "cciss_scsi.h"
   23.11  
    24.1 --- a/xen/drivers/char/keyboard.c	Wed Mar 10 14:41:38 2004 +0000
    24.2 +++ b/xen/drivers/char/keyboard.c	Wed Mar 10 16:07:13 2004 +0000
    24.3 @@ -14,7 +14,7 @@
    24.4  #include <xeno/event.h>
    24.5  #include <xeno/console.h>
    24.6  
    24.7 -/* Hash-defines torn from <linux/pc_keyb.h> and <asm/keyboard.h> */
    24.8 +/* Hash-defines torn from <xeno/pc_keyb.h> and <asm/keyboard.h> */
    24.9  
   24.10  #define KBD_STATUS_REG	     0x64 /* Status register (R) */
   24.11  #define KBD_CNTL_REG	     0x64 /* Controller command register (W) */
    25.1 --- a/xen/drivers/ide/ide-pci.c	Wed Mar 10 14:41:38 2004 +0000
    25.2 +++ b/xen/drivers/ide/ide-pci.c	Wed Mar 10 16:07:13 2004 +0000
    25.3 @@ -12,15 +12,15 @@
    25.4   *  configuration of all PCI IDE interfaces present in a system.  
    25.5   */
    25.6  
    25.7 -#include <linux/config.h>
    25.8 -#include <linux/types.h>
    25.9 -#include <linux/kernel.h>
   25.10 -#include <linux/timer.h>
   25.11 -#include <linux/mm.h>
   25.12 -#include <linux/interrupt.h>
   25.13 -#include <linux/pci.h>
   25.14 -#include <linux/init.h>
   25.15 -#include <linux/ide.h>
   25.16 +#include <xeno/config.h>
   25.17 +#include <xeno/types.h>
   25.18 +#include <xeno/kernel.h>
   25.19 +#include <xeno/timer.h>
   25.20 +#include <xeno/mm.h>
   25.21 +#include <xeno/interrupt.h>
   25.22 +#include <xeno/pci.h>
   25.23 +#include <xeno/init.h>
   25.24 +#include <xeno/ide.h>
   25.25  
   25.26  #include <asm/io.h>
   25.27  #include <asm/irq.h>
    26.1 --- a/xen/drivers/ide/ide_modes.h	Wed Mar 10 14:41:38 2004 +0000
    26.2 +++ b/xen/drivers/ide/ide_modes.h	Wed Mar 10 16:07:13 2004 +0000
    26.3 @@ -7,7 +7,7 @@
    26.4  #ifndef _IDE_MODES_H
    26.5  #define _IDE_MODES_H
    26.6  
    26.7 -#include <linux/config.h>
    26.8 +#include <xeno/config.h>
    26.9  
   26.10  /*
   26.11   * Shared data/functions for determining best PIO mode for an IDE drive.
    27.1 --- a/xen/drivers/ide/piix.c	Wed Mar 10 14:41:38 2004 +0000
    27.2 +++ b/xen/drivers/ide/piix.c	Wed Mar 10 16:07:13 2004 +0000
    27.3 @@ -53,15 +53,15 @@
    27.4   *
    27.5   */
    27.6  
    27.7 -#include <linux/config.h>
    27.8 -#include <linux/types.h>
    27.9 -#include <linux/kernel.h>
   27.10 -#include <linux/ioport.h>
   27.11 -#include <linux/pci.h>
   27.12 -#include <linux/hdreg.h>
   27.13 -#include <linux/ide.h>
   27.14 -#include <linux/delay.h>
   27.15 -#include <linux/init.h>
   27.16 +#include <xeno/config.h>
   27.17 +#include <xeno/types.h>
   27.18 +#include <xeno/kernel.h>
   27.19 +#include <xeno/ioport.h>
   27.20 +#include <xeno/pci.h>
   27.21 +#include <xeno/hdreg.h>
   27.22 +#include <xeno/ide.h>
   27.23 +#include <xeno/delay.h>
   27.24 +#include <xeno/init.h>
   27.25  
   27.26  #include <asm/io.h>
   27.27  
   27.28 @@ -72,8 +72,8 @@
   27.29  #define DISPLAY_PIIX_TIMINGS
   27.30  
   27.31  #if defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS)
   27.32 -#include <linux/stat.h>
   27.33 -#include <linux/proc_fs.h>
   27.34 +#include <xeno/stat.h>
   27.35 +#include <xeno/proc_fs.h>
   27.36  
   27.37  static int piix_get_info(char *, char **, off_t, int);
   27.38  extern int (*piix_display_info)(char *, char **, off_t, int); /* ide-proc.c */
    28.1 --- a/xen/drivers/message/fusion/isense.h	Wed Mar 10 14:41:38 2004 +0000
    28.2 +++ b/xen/drivers/message/fusion/isense.h	Wed Mar 10 16:07:13 2004 +0000
    28.3 @@ -3,9 +3,9 @@
    28.4  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    28.5  
    28.6  #ifdef __KERNEL__
    28.7 -#include <linux/types.h>		/* needed for u8, etc. */
    28.8 -#include <linux/string.h>		/* needed for strcat   */
    28.9 -#include <linux/kernel.h>		/* needed for sprintf  */
   28.10 +#include <xeno/types.h>		/* needed for u8, etc. */
   28.11 +#include <xeno/string.h>		/* needed for strcat   */
   28.12 +#include <xeno/kernel.h>		/* needed for sprintf  */
   28.13  #else
   28.14      #ifndef U_STUFF_DEFINED
   28.15      #define U_STUFF_DEFINED
    29.1 --- a/xen/drivers/message/fusion/linux_compat.h	Wed Mar 10 14:41:38 2004 +0000
    29.2 +++ b/xen/drivers/message/fusion/linux_compat.h	Wed Mar 10 16:07:13 2004 +0000
    29.3 @@ -4,10 +4,10 @@
    29.4  #define FUSION_LINUX_COMPAT_H
    29.5  /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    29.6  
    29.7 -#include <linux/version.h>
    29.8 -#include <linux/config.h>
    29.9 -#include <linux/kernel.h>
   29.10 -#include <linux/pci.h>
   29.11 +#include <xeno/version.h>
   29.12 +#include <xeno/config.h>
   29.13 +#include <xeno/kernel.h>
   29.14 +#include <xeno/pci.h>
   29.15  
   29.16  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
   29.17  
    30.1 --- a/xen/drivers/message/fusion/mptbase.h	Wed Mar 10 14:41:38 2004 +0000
    30.2 +++ b/xen/drivers/message/fusion/mptbase.h	Wed Mar 10 16:07:13 2004 +0000
    30.3 @@ -157,7 +157,7 @@
    30.4  
    30.5  /* SAE: Xen doesn't have a proc filesystem */
    30.6  #if defined(CONFIG_PROC_FS)
    30.7 -#include <linux/proc_fs.h>
    30.8 +#include <xeno/proc_fs.h>
    30.9  #endif
   30.10  
   30.11  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    31.1 --- a/xen/drivers/message/fusion/mptscsih.h	Wed Mar 10 14:41:38 2004 +0000
    31.2 +++ b/xen/drivers/message/fusion/mptscsih.h	Wed Mar 10 16:07:13 2004 +0000
    31.3 @@ -155,7 +155,7 @@ struct mptscsih_driver_setup
    31.4  		 *	Super HACK!  -by sralston:-(
    31.5  		 *	(good grief; heaven help me!)
    31.6  		 */
    31.7 -#		include <linux/capability.h>
    31.8 +#		include <xeno/capability.h>
    31.9  #		if !defined(CAP_LEASE) && !defined(MODULE)
   31.10  #			undef MPT_SCSIHOST_NEED_ENTRY_EXIT_HOOKUPS
   31.11  #		endif
   31.12 @@ -168,12 +168,12 @@ struct mptscsih_driver_setup
   31.13  
   31.14  /*
   31.15   *	tq_scheduler disappeared @ lk-2.4.0-test12
   31.16 - *	(right when <linux/sched.h> newly defined TQ_ACTIVE)
   31.17 + *	(right when <xeno/sched.h> newly defined TQ_ACTIVE)
   31.18   *	tq_struct reworked in 2.5.41. Include workqueue.h.
   31.19   */
   31.20  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,41)
   31.21 -#	include <linux/sched.h>
   31.22 -#	include <linux/workqueue.h>
   31.23 +#	include <xeno/sched.h>
   31.24 +#	include <xeno/workqueue.h>
   31.25  #define SCHEDULE_TASK(x)		\
   31.26  	if (schedule_work(x) == 0) {	\
   31.27  		/*MOD_DEC_USE_COUNT*/;	\
   31.28 @@ -181,7 +181,7 @@ struct mptscsih_driver_setup
   31.29  #else
   31.30  #define HAVE_TQ_SCHED	1
   31.31  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
   31.32 -#	include <linux/sched.h>
   31.33 +#	include <xeno/sched.h>
   31.34  #	ifdef TQ_ACTIVE
   31.35  #		undef HAVE_TQ_SCHED
   31.36  #	endif
    32.1 --- a/xen/drivers/message/fusion/scsi3.h	Wed Mar 10 14:41:38 2004 +0000
    32.2 +++ b/xen/drivers/message/fusion/scsi3.h	Wed Mar 10 16:07:13 2004 +0000
    32.3 @@ -21,7 +21,7 @@
    32.4   *  Includes
    32.5   */
    32.6  #ifdef __KERNEL__
    32.7 -#include <linux/types.h>
    32.8 +#include <xeno/types.h>
    32.9  #else
   32.10      #ifndef U_STUFF_DEFINED
   32.11      #define U_STUFF_DEFINED
    33.1 --- a/xen/drivers/net/3c59x.c	Wed Mar 10 14:41:38 2004 +0000
    33.2 +++ b/xen/drivers/net/3c59x.c	Wed Mar 10 16:07:13 2004 +0000
    33.3 @@ -224,26 +224,26 @@ static int vortex_debug = 1;
    33.4  #error You must compile this driver with "-O".
    33.5  #endif
    33.6  
    33.7 -#include <linux/config.h>
    33.8 -#include <linux/lib.h>
    33.9 -#include <linux/module.h>
   33.10 -//#include <linux/kernel.h>
   33.11 -#include <linux/sched.h>
   33.12 -//#include <linux/string.h>
   33.13 -#include <linux/timer.h>
   33.14 -#include <linux/errno.h>
   33.15 -//#include <linux/in.h>
   33.16 -#include <linux/ioport.h>
   33.17 -#include <linux/slab.h>
   33.18 -#include <linux/interrupt.h>
   33.19 -#include <linux/pci.h>
   33.20 -#include <linux/mii.h>
   33.21 -#include <linux/init.h>
   33.22 -#include <linux/netdevice.h>
   33.23 -#include <linux/etherdevice.h>
   33.24 -#include <linux/skbuff.h>
   33.25 -#include <linux/ethtool.h>
   33.26 -//#include <linux/highmem.h>
   33.27 +#include <xeno/config.h>
   33.28 +#include <xeno/lib.h>
   33.29 +#include <xeno/module.h>
   33.30 +//#include <xeno/kernel.h>
   33.31 +#include <xeno/sched.h>
   33.32 +//#include <xeno/string.h>
   33.33 +#include <xeno/timer.h>
   33.34 +#include <xeno/errno.h>
   33.35 +//#include <xeno/in.h>
   33.36 +#include <xeno/ioport.h>
   33.37 +#include <xeno/slab.h>
   33.38 +#include <xeno/interrupt.h>
   33.39 +#include <xeno/pci.h>
   33.40 +#include <xeno/mii.h>
   33.41 +#include <xeno/init.h>
   33.42 +#include <xeno/netdevice.h>
   33.43 +#include <xeno/etherdevice.h>
   33.44 +#include <xeno/skbuff.h>
   33.45 +#include <xeno/ethtool.h>
   33.46 +//#include <xeno/highmem.h>
   33.47  #include <asm/irq.h>			/* For NR_IRQS only. */
   33.48  #include <asm/bitops.h>
   33.49  #include <asm/io.h>
   33.50 @@ -262,7 +262,7 @@ static int vortex_debug = 1;
   33.51  
   33.52  #define RUN_AT(x) (jiffies + (x))
   33.53  
   33.54 -#include <linux/delay.h>
   33.55 +#include <xeno/delay.h>
   33.56  
   33.57  
   33.58  static char version[] __devinitdata =
    34.1 --- a/xen/drivers/net/8139too.c	Wed Mar 10 14:41:38 2004 +0000
    34.2 +++ b/xen/drivers/net/8139too.c	Wed Mar 10 16:07:13 2004 +0000
    34.3 @@ -96,30 +96,30 @@
    34.4  #define DRV_VERSION	"0.9.26"
    34.5  
    34.6  
    34.7 -#include <linux/config.h>
    34.8 -#include <linux/module.h>
    34.9 +#include <xeno/config.h>
   34.10 +#include <xeno/module.h>
   34.11  
   34.12  #ifdef XEN
   34.13  typedef int pid_t;
   34.14 -#include <linux/lib.h>
   34.15 +#include <xeno/lib.h>
   34.16  #endif
   34.17 -#include <linux/kernel.h>
   34.18 -#include <linux/compiler.h>
   34.19 -#include <linux/pci.h>
   34.20 -#include <linux/init.h>
   34.21 -#include <linux/ioport.h>
   34.22 -#include <linux/netdevice.h>
   34.23 -#include <linux/etherdevice.h>
   34.24 +#include <xeno/kernel.h>
   34.25 +#include <xeno/compiler.h>
   34.26 +#include <xeno/pci.h>
   34.27 +#include <xeno/init.h>
   34.28 +#include <xeno/ioport.h>
   34.29 +#include <xeno/netdevice.h>
   34.30 +#include <xeno/etherdevice.h>
   34.31  #ifndef XEN
   34.32 -#include <linux/rtnetlink.h>
   34.33 +#include <xeno/rtnetlink.h>
   34.34  #endif
   34.35 -#include <linux/delay.h>
   34.36 -#include <linux/ethtool.h>
   34.37 -#include <linux/mii.h>
   34.38 +#include <xeno/delay.h>
   34.39 +#include <xeno/ethtool.h>
   34.40 +#include <xeno/mii.h>
   34.41  #ifndef XEN
   34.42 -#include <linux/completion.h>
   34.43 +#include <xeno/completion.h>
   34.44  #endif
   34.45 -#include <linux/crc32.h>
   34.46 +#include <xeno/crc32.h>
   34.47  #include <asm/io.h>
   34.48  #include <asm/uaccess.h>
   34.49  
    35.1 --- a/xen/drivers/net/Space.c	Wed Mar 10 14:41:38 2004 +0000
    35.2 +++ b/xen/drivers/net/Space.c	Wed Mar 10 16:07:13 2004 +0000
    35.3 @@ -11,8 +11,8 @@
    35.4   *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
    35.5   *		Donald J. Becker, <becker@scyld.com>
    35.6   */
    35.7 -#include <linux/config.h>
    35.8 -#include <linux/netdevice.h>
    35.9 +#include <xeno/config.h>
   35.10 +#include <xeno/netdevice.h>
   35.11  
   35.12  /*
   35.13   * KAF (23/7/02): All the probe shit is gone from here -- each network
    36.1 --- a/xen/drivers/net/e100/e100.h	Wed Mar 10 14:41:38 2004 +0000
    36.2 +++ b/xen/drivers/net/e100/e100.h	Wed Mar 10 16:07:13 2004 +0000
    36.3 @@ -21,44 +21,44 @@
    36.4    file called LICENSE.
    36.5    
    36.6    Contact Information:
    36.7 -  Linux NICS <linux.nics@intel.com>
    36.8 +  Linux NICS <xeno.nics@intel.com>
    36.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   36.10  *******************************************************************************/
   36.11  
   36.12  #ifndef _E100_INC_
   36.13  #define _E100_INC_
   36.14  
   36.15 -#include <linux/module.h>
   36.16 -#include <linux/types.h>
   36.17 -#include <linux/init.h>
   36.18 -#include <linux/mm.h>
   36.19 -#include <linux/errno.h>
   36.20 -#include <linux/ioport.h>
   36.21 -#include <linux/pci.h>
   36.22 -#include <linux/kernel.h>
   36.23 -#include <linux/netdevice.h>
   36.24 -#include <linux/etherdevice.h>
   36.25 -#include <linux/skbuff.h>
   36.26 -#include <linux/delay.h>
   36.27 -#include <linux/timer.h>
   36.28 -#include <linux/slab.h>
   36.29 -#include <linux/interrupt.h>
   36.30 -#include <linux/version.h>
   36.31 -#include <linux/string.h>
   36.32 -/*#include <linux/wait.h>*/
   36.33 -#include <linux/reboot.h>
   36.34 +#include <xeno/module.h>
   36.35 +#include <xeno/types.h>
   36.36 +#include <xeno/init.h>
   36.37 +#include <xeno/mm.h>
   36.38 +#include <xeno/errno.h>
   36.39 +#include <xeno/ioport.h>
   36.40 +#include <xeno/pci.h>
   36.41 +#include <xeno/kernel.h>
   36.42 +#include <xeno/netdevice.h>
   36.43 +#include <xeno/etherdevice.h>
   36.44 +#include <xeno/skbuff.h>
   36.45 +#include <xeno/delay.h>
   36.46 +#include <xeno/timer.h>
   36.47 +#include <xeno/slab.h>
   36.48 +#include <xeno/interrupt.h>
   36.49 +#include <xeno/version.h>
   36.50 +#include <xeno/string.h>
   36.51 +/*#include <xeno/wait.h>*/
   36.52 +#include <xeno/reboot.h>
   36.53  #include <asm/io.h>
   36.54  #include <asm/unaligned.h>
   36.55  #include <asm/processor.h>
   36.56 -#include <linux/ethtool.h>
   36.57 -/*#include <linux/inetdevice.h>*/
   36.58 +#include <xeno/ethtool.h>
   36.59 +/*#include <xeno/inetdevice.h>*/
   36.60  #include <asm/bitops.h>
   36.61  
   36.62 -#include <linux/if.h>
   36.63 +#include <xeno/if.h>
   36.64  #include <asm/uaccess.h>
   36.65 -/*#include <linux/ip.h>*/
   36.66 -#include <linux/if_vlan.h>
   36.67 -#include <linux/mii.h>
   36.68 +/*#include <xeno/ip.h>*/
   36.69 +#include <xeno/if_vlan.h>
   36.70 +#include <xeno/mii.h>
   36.71  
   36.72  #define yield() ((void)0)
   36.73  
    37.1 --- a/xen/drivers/net/e100/e100_config.c	Wed Mar 10 14:41:38 2004 +0000
    37.2 +++ b/xen/drivers/net/e100/e100_config.c	Wed Mar 10 16:07:13 2004 +0000
    37.3 @@ -21,7 +21,7 @@
    37.4    file called LICENSE.
    37.5    
    37.6    Contact Information:
    37.7 -  Linux NICS <linux.nics@intel.com>
    37.8 +  Linux NICS <xeno.nics@intel.com>
    37.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   37.10  *******************************************************************************/
   37.11  
    38.1 --- a/xen/drivers/net/e100/e100_config.h	Wed Mar 10 14:41:38 2004 +0000
    38.2 +++ b/xen/drivers/net/e100/e100_config.h	Wed Mar 10 16:07:13 2004 +0000
    38.3 @@ -21,7 +21,7 @@
    38.4    file called LICENSE.
    38.5    
    38.6    Contact Information:
    38.7 -  Linux NICS <linux.nics@intel.com>
    38.8 +  Linux NICS <xeno.nics@intel.com>
    38.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   38.10  *******************************************************************************/
   38.11  
    39.1 --- a/xen/drivers/net/e100/e100_eeprom.c	Wed Mar 10 14:41:38 2004 +0000
    39.2 +++ b/xen/drivers/net/e100/e100_eeprom.c	Wed Mar 10 16:07:13 2004 +0000
    39.3 @@ -21,7 +21,7 @@
    39.4    file called LICENSE.
    39.5    
    39.6    Contact Information:
    39.7 -  Linux NICS <linux.nics@intel.com>
    39.8 +  Linux NICS <xeno.nics@intel.com>
    39.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   39.10  *******************************************************************************/
   39.11  
    40.1 --- a/xen/drivers/net/e100/e100_main.c	Wed Mar 10 14:41:38 2004 +0000
    40.2 +++ b/xen/drivers/net/e100/e100_main.c	Wed Mar 10 16:07:13 2004 +0000
    40.3 @@ -21,7 +21,7 @@
    40.4    file called LICENSE.
    40.5    
    40.6    Contact Information:
    40.7 -  Linux NICS <linux.nics@intel.com>
    40.8 +  Linux NICS <xeno.nics@intel.com>
    40.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   40.10  *******************************************************************************/
   40.11  
   40.12 @@ -78,10 +78,10 @@
   40.13   * 2.1.24       10/7/02
   40.14   */
   40.15   
   40.16 -#include <linux/config.h>
   40.17 +#include <xeno/config.h>
   40.18  /*#include <net/checksum.h>*/
   40.19 -/*#include <linux/tcp.h>*/
   40.20 -/*#include <linux/udp.h>*/
   40.21 +/*#include <xeno/tcp.h>*/
   40.22 +/*#include <xeno/udp.h>*/
   40.23  #include "e100.h"
   40.24  #include "e100_ucode.h"
   40.25  #include "e100_config.h"
   40.26 @@ -379,7 +379,7 @@ static inline tcb_t *e100_prepare_xmit_b
   40.27  					    struct sk_buff *);
   40.28  static void e100_set_multi_exec(struct net_device *dev);
   40.29  
   40.30 -MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
   40.31 +MODULE_AUTHOR("Intel Corporation, <xeno.nics@intel.com>");
   40.32  MODULE_DESCRIPTION("Intel(R) PRO/100 Network Driver");
   40.33  MODULE_LICENSE("GPL");
   40.34  
    41.1 --- a/xen/drivers/net/e100/e100_phy.c	Wed Mar 10 14:41:38 2004 +0000
    41.2 +++ b/xen/drivers/net/e100/e100_phy.c	Wed Mar 10 16:07:13 2004 +0000
    41.3 @@ -21,7 +21,7 @@
    41.4    file called LICENSE.
    41.5    
    41.6    Contact Information:
    41.7 -  Linux NICS <linux.nics@intel.com>
    41.8 +  Linux NICS <xeno.nics@intel.com>
    41.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   41.10  *******************************************************************************/
   41.11  
    42.1 --- a/xen/drivers/net/e100/e100_phy.h	Wed Mar 10 14:41:38 2004 +0000
    42.2 +++ b/xen/drivers/net/e100/e100_phy.h	Wed Mar 10 16:07:13 2004 +0000
    42.3 @@ -21,7 +21,7 @@
    42.4    file called LICENSE.
    42.5    
    42.6    Contact Information:
    42.7 -  Linux NICS <linux.nics@intel.com>
    42.8 +  Linux NICS <xeno.nics@intel.com>
    42.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   42.10  *******************************************************************************/
   42.11  
    43.1 --- a/xen/drivers/net/e100/e100_test.c	Wed Mar 10 14:41:38 2004 +0000
    43.2 +++ b/xen/drivers/net/e100/e100_test.c	Wed Mar 10 16:07:13 2004 +0000
    43.3 @@ -21,7 +21,7 @@
    43.4    file called LICENSE.
    43.5    
    43.6    Contact Information:
    43.7 -  Linux NICS <linux.nics@intel.com>
    43.8 +  Linux NICS <xeno.nics@intel.com>
    43.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   43.10  *******************************************************************************/
   43.11  
    44.1 --- a/xen/drivers/net/e100/e100_ucode.h	Wed Mar 10 14:41:38 2004 +0000
    44.2 +++ b/xen/drivers/net/e100/e100_ucode.h	Wed Mar 10 16:07:13 2004 +0000
    44.3 @@ -21,7 +21,7 @@
    44.4    file called LICENSE.
    44.5    
    44.6    Contact Information:
    44.7 -  Linux NICS <linux.nics@intel.com>
    44.8 +  Linux NICS <xeno.nics@intel.com>
    44.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   44.10  *******************************************************************************/
   44.11  
    45.1 --- a/xen/drivers/net/e1000/e1000.h	Wed Mar 10 14:41:38 2004 +0000
    45.2 +++ b/xen/drivers/net/e1000/e1000.h	Wed Mar 10 16:07:13 2004 +0000
    45.3 @@ -21,7 +21,7 @@
    45.4    file called LICENSE.
    45.5    
    45.6    Contact Information:
    45.7 -  Linux NICS <linux.nics@intel.com>
    45.8 +  Linux NICS <xeno.nics@intel.com>
    45.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   45.10  
   45.11  *******************************************************************************/
   45.12 @@ -32,48 +32,48 @@
   45.13  #ifndef _E1000_H_
   45.14  #define _E1000_H_
   45.15  
   45.16 -//#include <linux/stddef.h>
   45.17 -#include <linux/config.h>
   45.18 -#include <linux/module.h>
   45.19 -#include <linux/types.h>
   45.20 +//#include <xeno/stddef.h>
   45.21 +#include <xeno/config.h>
   45.22 +#include <xeno/module.h>
   45.23 +#include <xeno/types.h>
   45.24  #include <asm/byteorder.h>
   45.25 -#include <linux/init.h>
   45.26 -#include <linux/mm.h>
   45.27 -#include <linux/errno.h>
   45.28 -#include <linux/ioport.h>
   45.29 -#include <linux/pci.h>
   45.30 -#include <linux/kernel.h>
   45.31 -#include <linux/netdevice.h>
   45.32 -#include <linux/etherdevice.h>
   45.33 -#include <linux/skbuff.h>
   45.34 -#include <linux/delay.h>
   45.35 -#include <linux/timer.h>
   45.36 -#include <linux/slab.h>
   45.37 -#include <linux/interrupt.h>
   45.38 -#include <linux/string.h>
   45.39 -//#include <linux/pagemap.h>
   45.40 +#include <xeno/init.h>
   45.41 +#include <xeno/mm.h>
   45.42 +#include <xeno/errno.h>
   45.43 +#include <xeno/ioport.h>
   45.44 +#include <xeno/pci.h>
   45.45 +#include <xeno/kernel.h>
   45.46 +#include <xeno/netdevice.h>
   45.47 +#include <xeno/etherdevice.h>
   45.48 +#include <xeno/skbuff.h>
   45.49 +#include <xeno/delay.h>
   45.50 +#include <xeno/timer.h>
   45.51 +#include <xeno/slab.h>
   45.52 +#include <xeno/interrupt.h>
   45.53 +#include <xeno/string.h>
   45.54 +//#include <xeno/pagemap.h>
   45.55  #include <asm/bitops.h>
   45.56  #include <asm/io.h>
   45.57  #include <asm/irq.h>
   45.58 -//#include <linux/capability.h>
   45.59 -#include <linux/in.h>
   45.60 -//#include <linux/ip.h>
   45.61 -//#include <linux/tcp.h>
   45.62 -//#include <linux/udp.h>
   45.63 +//#include <xeno/capability.h>
   45.64 +#include <xeno/in.h>
   45.65 +//#include <xeno/ip.h>
   45.66 +//#include <xeno/tcp.h>
   45.67 +//#include <xeno/udp.h>
   45.68  //#include <net/pkt_sched.h>
   45.69 -#include <linux/list.h>
   45.70 -#include <linux/reboot.h>
   45.71 +#include <xeno/list.h>
   45.72 +#include <xeno/reboot.h>
   45.73  #ifdef NETIF_F_TSO
   45.74  #include <net/checksum.h>
   45.75  #endif
   45.76  #ifdef SIOCGMIIPHY
   45.77 -#include <linux/mii.h>
   45.78 +#include <xeno/mii.h>
   45.79  #endif
   45.80  #ifdef SIOCETHTOOL
   45.81 -#include <linux/ethtool.h>
   45.82 +#include <xeno/ethtool.h>
   45.83  #endif
   45.84  #ifdef NETIF_F_HW_VLAN_TX
   45.85 -#include <linux/if_vlan.h>
   45.86 +#include <xeno/if_vlan.h>
   45.87  #endif
   45.88  
   45.89  #define BAR_0		0
    46.1 --- a/xen/drivers/net/e1000/e1000_ethtool.c	Wed Mar 10 14:41:38 2004 +0000
    46.2 +++ b/xen/drivers/net/e1000/e1000_ethtool.c	Wed Mar 10 16:07:13 2004 +0000
    46.3 @@ -21,7 +21,7 @@
    46.4    file called LICENSE.
    46.5    
    46.6    Contact Information:
    46.7 -  Linux NICS <linux.nics@intel.com>
    46.8 +  Linux NICS <xeno.nics@intel.com>
    46.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   46.10  
   46.11  *******************************************************************************/
    47.1 --- a/xen/drivers/net/e1000/e1000_hw.c	Wed Mar 10 14:41:38 2004 +0000
    47.2 +++ b/xen/drivers/net/e1000/e1000_hw.c	Wed Mar 10 16:07:13 2004 +0000
    47.3 @@ -21,7 +21,7 @@
    47.4    file called LICENSE.
    47.5    
    47.6    Contact Information:
    47.7 -  Linux NICS <linux.nics@intel.com>
    47.8 +  Linux NICS <xeno.nics@intel.com>
    47.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   47.10  
   47.11  *******************************************************************************/
    48.1 --- a/xen/drivers/net/e1000/e1000_hw.h	Wed Mar 10 14:41:38 2004 +0000
    48.2 +++ b/xen/drivers/net/e1000/e1000_hw.h	Wed Mar 10 16:07:13 2004 +0000
    48.3 @@ -21,7 +21,7 @@
    48.4    file called LICENSE.
    48.5    
    48.6    Contact Information:
    48.7 -  Linux NICS <linux.nics@intel.com>
    48.8 +  Linux NICS <xeno.nics@intel.com>
    48.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   48.10  
   48.11  *******************************************************************************/
    49.1 --- a/xen/drivers/net/e1000/e1000_main.c	Wed Mar 10 14:41:38 2004 +0000
    49.2 +++ b/xen/drivers/net/e1000/e1000_main.c	Wed Mar 10 16:07:13 2004 +0000
    49.3 @@ -21,7 +21,7 @@
    49.4    file called LICENSE.
    49.5    
    49.6    Contact Information:
    49.7 -  Linux NICS <linux.nics@intel.com>
    49.8 +  Linux NICS <xeno.nics@intel.com>
    49.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   49.10  
   49.11  *******************************************************************************/
   49.12 @@ -204,7 +204,7 @@ static struct pci_driver e1000_driver = 
   49.13  #endif
   49.14  };
   49.15  
   49.16 -MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
   49.17 +MODULE_AUTHOR("Intel Corporation, <xeno.nics@intel.com>");
   49.18  MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
   49.19  MODULE_LICENSE("GPL");
   49.20  
    50.1 --- a/xen/drivers/net/e1000/e1000_osdep.h	Wed Mar 10 14:41:38 2004 +0000
    50.2 +++ b/xen/drivers/net/e1000/e1000_osdep.h	Wed Mar 10 16:07:13 2004 +0000
    50.3 @@ -21,7 +21,7 @@
    50.4    file called LICENSE.
    50.5    
    50.6    Contact Information:
    50.7 -  Linux NICS <linux.nics@intel.com>
    50.8 +  Linux NICS <xeno.nics@intel.com>
    50.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   50.10  
   50.11  *******************************************************************************/
   50.12 @@ -34,12 +34,12 @@
   50.13  #ifndef _E1000_OSDEP_H_
   50.14  #define _E1000_OSDEP_H_
   50.15  
   50.16 -#include <linux/types.h>
   50.17 -#include <linux/pci.h>
   50.18 -#include <linux/delay.h>
   50.19 +#include <xeno/types.h>
   50.20 +#include <xeno/pci.h>
   50.21 +#include <xeno/delay.h>
   50.22  #include <asm/io.h>
   50.23 -#include <linux/interrupt.h>
   50.24 -#include <linux/sched.h>
   50.25 +#include <xeno/interrupt.h>
   50.26 +#include <xeno/sched.h>
   50.27  #include "kcompat.h"
   50.28  
   50.29  #define usec_delay(x) udelay(x)
    51.1 --- a/xen/drivers/net/e1000/e1000_param.c	Wed Mar 10 14:41:38 2004 +0000
    51.2 +++ b/xen/drivers/net/e1000/e1000_param.c	Wed Mar 10 16:07:13 2004 +0000
    51.3 @@ -21,7 +21,7 @@
    51.4    file called LICENSE.
    51.5    
    51.6    Contact Information:
    51.7 -  Linux NICS <linux.nics@intel.com>
    51.8 +  Linux NICS <xeno.nics@intel.com>
    51.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   51.10  
   51.11  *******************************************************************************/
    52.1 --- a/xen/drivers/net/e1000/kcompat.c	Wed Mar 10 14:41:38 2004 +0000
    52.2 +++ b/xen/drivers/net/e1000/kcompat.c	Wed Mar 10 16:07:13 2004 +0000
    52.3 @@ -21,7 +21,7 @@
    52.4    file called LICENSE.
    52.5    
    52.6    Contact Information:
    52.7 -  Linux NICS <linux.nics@intel.com>
    52.8 +  Linux NICS <xeno.nics@intel.com>
    52.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   52.10  
   52.11  *******************************************************************************/
    53.1 --- a/xen/drivers/net/e1000/kcompat.h	Wed Mar 10 14:41:38 2004 +0000
    53.2 +++ b/xen/drivers/net/e1000/kcompat.h	Wed Mar 10 16:07:13 2004 +0000
    53.3 @@ -21,7 +21,7 @@
    53.4    file called LICENSE.
    53.5    
    53.6    Contact Information:
    53.7 -  Linux NICS <linux.nics@intel.com>
    53.8 +  Linux NICS <xeno.nics@intel.com>
    53.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
   53.10  
   53.11  *******************************************************************************/
   53.12 @@ -29,17 +29,17 @@
   53.13  #ifndef _KCOMPAT_H_
   53.14  #define _KCOMPAT_H_
   53.15  
   53.16 -#include <linux/version.h>
   53.17 -#include <linux/types.h>
   53.18 -#include <linux/errno.h>
   53.19 -#include <linux/module.h>
   53.20 -#include <linux/pci.h>
   53.21 -#include <linux/netdevice.h>
   53.22 -#include <linux/ioport.h>
   53.23 -#include <linux/slab.h>
   53.24 -//#include <linux/pagemap.h>
   53.25 -#include <linux/list.h>
   53.26 -#include <linux/sched.h>
   53.27 +#include <xeno/version.h>
   53.28 +#include <xeno/types.h>
   53.29 +#include <xeno/errno.h>
   53.30 +#include <xeno/module.h>
   53.31 +#include <xeno/pci.h>
   53.32 +#include <xeno/netdevice.h>
   53.33 +#include <xeno/ioport.h>
   53.34 +#include <xeno/slab.h>
   53.35 +//#include <xeno/pagemap.h>
   53.36 +#include <xeno/list.h>
   53.37 +#include <xeno/sched.h>
   53.38  #include <asm/io.h>
   53.39  
   53.40  #ifndef IRQ_HANDLED
   53.41 @@ -296,7 +296,7 @@ static inline void _kc_synchronize_irq()
   53.42  #undef synchronize_irq
   53.43  #define synchronize_irq(X) _kc_synchronize_irq()
   53.44  
   53.45 -#include <linux/tqueue.h>
   53.46 +#include <xeno/tqueue.h>
   53.47  #define work_struct tq_struct
   53.48  #define INIT_WORK INIT_TQUEUE
   53.49  #define schedule_work schedule_task
    54.1 --- a/xen/drivers/net/net_init.c	Wed Mar 10 14:41:38 2004 +0000
    54.2 +++ b/xen/drivers/net/net_init.c	Wed Mar 10 16:07:13 2004 +0000
    54.3 @@ -33,25 +33,25 @@
    54.4  
    54.5  */
    54.6  
    54.7 -#include <linux/config.h>
    54.8 -#include <linux/module.h>
    54.9 -#include <linux/errno.h>
   54.10 -//#include <linux/kernel.h>
   54.11 -#include <linux/sched.h>
   54.12 -#include <linux/types.h>
   54.13 -//#include <linux/fs.h>
   54.14 -#include <linux/slab.h>
   54.15 -#include <linux/if_ether.h>
   54.16 -#include <linux/lib.h>
   54.17 -#include <linux/netdevice.h>
   54.18 -#include <linux/etherdevice.h>
   54.19 -//#include <linux/fddidevice.h>
   54.20 -//#include <linux/hippidevice.h>
   54.21 -//#include <linux/trdevice.h>
   54.22 -//#include <linux/fcdevice.h>
   54.23 -//#include <linux/if_arp.h>
   54.24 -//#include <linux/if_ltalk.h>
   54.25 -//#include <linux/rtnetlink.h>
   54.26 +#include <xeno/config.h>
   54.27 +#include <xeno/module.h>
   54.28 +#include <xeno/errno.h>
   54.29 +//#include <xeno/kernel.h>
   54.30 +#include <xeno/sched.h>
   54.31 +#include <xeno/types.h>
   54.32 +//#include <xeno/fs.h>
   54.33 +#include <xeno/slab.h>
   54.34 +#include <xeno/if_ether.h>
   54.35 +#include <xeno/lib.h>
   54.36 +#include <xeno/netdevice.h>
   54.37 +#include <xeno/etherdevice.h>
   54.38 +//#include <xeno/fddidevice.h>
   54.39 +//#include <xeno/hippidevice.h>
   54.40 +//#include <xeno/trdevice.h>
   54.41 +//#include <xeno/fcdevice.h>
   54.42 +//#include <xeno/if_arp.h>
   54.43 +//#include <xeno/if_ltalk.h>
   54.44 +//#include <xeno/rtnetlink.h>
   54.45  //#include <net/neighbour.h>
   54.46  
   54.47  #define rtnl_lock() ((void)0)
    55.1 --- a/xen/drivers/net/pcnet32.c	Wed Mar 10 14:41:38 2004 +0000
    55.2 +++ b/xen/drivers/net/pcnet32.c	Wed Mar 10 16:07:13 2004 +0000
    55.3 @@ -29,30 +29,30 @@
    55.4  static const char *version =
    55.5  DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
    55.6  
    55.7 -#include <linux/module.h>
    55.8 +#include <xeno/module.h>
    55.9  
   55.10 -#include <linux/kernel.h>
   55.11 -#include <linux/sched.h>
   55.12 -#include <linux/string.h>
   55.13 -#include <linux/errno.h>
   55.14 -#include <linux/ioport.h>
   55.15 -#include <linux/slab.h>
   55.16 -#include <linux/interrupt.h>
   55.17 -#include <linux/pci.h>
   55.18 -#include <linux/delay.h>
   55.19 -#include <linux/init.h>
   55.20 -#include <linux/ethtool.h>
   55.21 -#include <linux/mii.h>
   55.22 -#include <linux/crc32.h>
   55.23 +#include <xeno/kernel.h>
   55.24 +#include <xeno/sched.h>
   55.25 +#include <xeno/string.h>
   55.26 +#include <xeno/errno.h>
   55.27 +#include <xeno/ioport.h>
   55.28 +#include <xeno/slab.h>
   55.29 +#include <xeno/interrupt.h>
   55.30 +#include <xeno/pci.h>
   55.31 +#include <xeno/delay.h>
   55.32 +#include <xeno/init.h>
   55.33 +#include <xeno/ethtool.h>
   55.34 +#include <xeno/mii.h>
   55.35 +#include <xeno/crc32.h>
   55.36  #include <asm/bitops.h>
   55.37  #include <asm/io.h>
   55.38  #include <asm/dma.h>
   55.39  #include <asm/uaccess.h>
   55.40  
   55.41 -#include <linux/netdevice.h>
   55.42 -#include <linux/etherdevice.h>
   55.43 -#include <linux/skbuff.h>
   55.44 -#include <linux/spinlock.h>
   55.45 +#include <xeno/netdevice.h>
   55.46 +#include <xeno/etherdevice.h>
   55.47 +#include <xeno/skbuff.h>
   55.48 +#include <xeno/spinlock.h>
   55.49  
   55.50  #undef TX_RING_SIZE
   55.51  #undef RX_RING_SIZE
    56.1 --- a/xen/drivers/net/setup.c	Wed Mar 10 14:41:38 2004 +0000
    56.2 +++ b/xen/drivers/net/setup.c	Wed Mar 10 16:07:13 2004 +0000
    56.3 @@ -3,11 +3,11 @@
    56.4   *	New style setup code for the network devices
    56.5   */
    56.6   
    56.7 -#include <linux/config.h>
    56.8 -#include <linux/netdevice.h>
    56.9 -#include <linux/errno.h>
   56.10 -#include <linux/init.h>
   56.11 -//#include <linux/netlink.h>
   56.12 +#include <xeno/config.h>
   56.13 +#include <xeno/netdevice.h>
   56.14 +#include <xeno/errno.h>
   56.15 +#include <xeno/init.h>
   56.16 +//#include <xeno/netlink.h>
   56.17  
   56.18  extern int slip_init_ctrl_dev(void);
   56.19  extern int x25_asy_init_ctrl_dev(void);
    57.1 --- a/xen/drivers/net/tg3.c	Wed Mar 10 14:41:38 2004 +0000
    57.2 +++ b/xen/drivers/net/tg3.c	Wed Mar 10 16:07:13 2004 +0000
    57.3 @@ -5,27 +5,27 @@
    57.4   * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
    57.5   */
    57.6  
    57.7 -#include <linux/config.h>
    57.8 -
    57.9 -#include <linux/module.h>
   57.10 -
   57.11 -#include <linux/kernel.h>
   57.12 -#include <linux/types.h>
   57.13 -#include <linux/tqueue.h> // Xen
   57.14 -#include <linux/compiler.h>
   57.15 -#include <linux/slab.h>
   57.16 -#include <linux/delay.h>
   57.17 -#include <linux/init.h>
   57.18 -#include <linux/ioport.h>
   57.19 -#include <linux/pci.h>
   57.20 -#include <linux/netdevice.h>
   57.21 -#include <linux/etherdevice.h>
   57.22 -#include <linux/skbuff.h>
   57.23 -#include <linux/ethtool.h>
   57.24 -#include <linux/mii.h>
   57.25 -#include <linux/if_vlan.h>
   57.26 -//#include <linux/ip.h>
   57.27 -//#include <linux/tcp.h>
   57.28 +#include <xeno/config.h>
   57.29 +
   57.30 +#include <xeno/module.h>
   57.31 +
   57.32 +#include <xeno/kernel.h>
   57.33 +#include <xeno/types.h>
   57.34 +#include <xeno/tqueue.h> // Xen
   57.35 +#include <xeno/compiler.h>
   57.36 +#include <xeno/slab.h>
   57.37 +#include <xeno/delay.h>
   57.38 +#include <xeno/init.h>
   57.39 +#include <xeno/ioport.h>
   57.40 +#include <xeno/pci.h>
   57.41 +#include <xeno/netdevice.h>
   57.42 +#include <xeno/etherdevice.h>
   57.43 +#include <xeno/skbuff.h>
   57.44 +#include <xeno/ethtool.h>
   57.45 +#include <xeno/mii.h>
   57.46 +#include <xeno/if_vlan.h>
   57.47 +//#include <xeno/ip.h>
   57.48 +//#include <xeno/tcp.h>
   57.49  
   57.50  //#include <net/checksum.h>
   57.51  
    58.1 --- a/xen/drivers/net/tulip/21142.c	Wed Mar 10 14:41:38 2004 +0000
    58.2 +++ b/xen/drivers/net/tulip/21142.c	Wed Mar 10 16:07:13 2004 +0000
    58.3 @@ -15,8 +15,8 @@
    58.4  */
    58.5  
    58.6  #include "tulip.h"
    58.7 -#include <linux/pci.h>
    58.8 -#include <linux/delay.h>
    58.9 +#include <xeno/pci.h>
   58.10 +#include <xeno/delay.h>
   58.11  
   58.12  
   58.13  static u16 t21142_csr13[] = { 0x0001, 0x0009, 0x0009, 0x0000, 0x0001, };
    59.1 --- a/xen/drivers/net/tulip/eeprom.c	Wed Mar 10 14:41:38 2004 +0000
    59.2 +++ b/xen/drivers/net/tulip/eeprom.c	Wed Mar 10 16:07:13 2004 +0000
    59.3 @@ -15,7 +15,7 @@
    59.4  */
    59.5  
    59.6  #include "tulip.h"
    59.7 -#include <linux/init.h>
    59.8 +#include <xeno/init.h>
    59.9  #include <asm/unaligned.h>
   59.10  
   59.11  
    60.1 --- a/xen/drivers/net/tulip/interrupt.c	Wed Mar 10 14:41:38 2004 +0000
    60.2 +++ b/xen/drivers/net/tulip/interrupt.c	Wed Mar 10 16:07:13 2004 +0000
    60.3 @@ -15,9 +15,9 @@
    60.4  */
    60.5  
    60.6  #include "tulip.h"
    60.7 -#include <linux/config.h>
    60.8 -#include <linux/etherdevice.h>
    60.9 -#include <linux/pci.h>
   60.10 +#include <xeno/config.h>
   60.11 +#include <xeno/etherdevice.h>
   60.12 +#include <xeno/pci.h>
   60.13  
   60.14  
   60.15  int tulip_rx_copybreak;
    61.1 --- a/xen/drivers/net/tulip/media.c	Wed Mar 10 14:41:38 2004 +0000
    61.2 +++ b/xen/drivers/net/tulip/media.c	Wed Mar 10 16:07:13 2004 +0000
    61.3 @@ -14,10 +14,10 @@
    61.4  
    61.5  */
    61.6  
    61.7 -#include <linux/kernel.h>
    61.8 -#include <linux/mii.h>
    61.9 -#include <linux/init.h>
   61.10 -#include <linux/delay.h>
   61.11 +#include <xeno/kernel.h>
   61.12 +#include <xeno/mii.h>
   61.13 +#include <xeno/init.h>
   61.14 +#include <xeno/delay.h>
   61.15  #include "tulip.h"
   61.16  
   61.17  
    62.1 --- a/xen/drivers/net/tulip/pnic.c	Wed Mar 10 14:41:38 2004 +0000
    62.2 +++ b/xen/drivers/net/tulip/pnic.c	Wed Mar 10 16:07:13 2004 +0000
    62.3 @@ -14,7 +14,7 @@
    62.4  
    62.5  */
    62.6  
    62.7 -#include <linux/kernel.h>
    62.8 +#include <xeno/kernel.h>
    62.9  #include "tulip.h"
   62.10  
   62.11  
    63.1 --- a/xen/drivers/net/tulip/pnic2.c	Wed Mar 10 14:41:38 2004 +0000
    63.2 +++ b/xen/drivers/net/tulip/pnic2.c	Wed Mar 10 16:07:13 2004 +0000
    63.3 @@ -77,8 +77,8 @@
    63.4  
    63.5  
    63.6  #include "tulip.h"
    63.7 -#include <linux/pci.h>
    63.8 -#include <linux/delay.h>
    63.9 +#include <xeno/pci.h>
   63.10 +#include <xeno/delay.h>
   63.11  
   63.12  
   63.13  void pnic2_timer(unsigned long data)
    64.1 --- a/xen/drivers/net/tulip/tulip.h	Wed Mar 10 14:41:38 2004 +0000
    64.2 +++ b/xen/drivers/net/tulip/tulip.h	Wed Mar 10 16:07:13 2004 +0000
    64.3 @@ -16,13 +16,13 @@
    64.4  #ifndef __NET_TULIP_H__
    64.5  #define __NET_TULIP_H__
    64.6  
    64.7 -#include <linux/config.h>
    64.8 -#include <linux/kernel.h>
    64.9 -#include <linux/types.h>
   64.10 -#include <linux/spinlock.h>
   64.11 -#include <linux/netdevice.h>
   64.12 -#include <linux/timer.h>
   64.13 -#include <linux/delay.h>
   64.14 +#include <xeno/config.h>
   64.15 +#include <xeno/kernel.h>
   64.16 +#include <xeno/types.h>
   64.17 +#include <xeno/spinlock.h>
   64.18 +#include <xeno/netdevice.h>
   64.19 +#include <xeno/timer.h>
   64.20 +#include <xeno/delay.h>
   64.21  #include <asm/io.h>
   64.22  #include <asm/irq.h>
   64.23  
    65.1 --- a/xen/drivers/net/tulip/tulip_core.c	Wed Mar 10 14:41:38 2004 +0000
    65.2 +++ b/xen/drivers/net/tulip/tulip_core.c	Wed Mar 10 16:07:13 2004 +0000
    65.3 @@ -18,16 +18,16 @@
    65.4  #define DRV_VERSION	"0.9.15-pre12"
    65.5  #define DRV_RELDATE	"Aug 9, 2002"
    65.6  
    65.7 -#include <linux/config.h>
    65.8 -#include <linux/module.h>
    65.9 +#include <xeno/config.h>
   65.10 +#include <xeno/module.h>
   65.11  #include "tulip.h"
   65.12 -#include <linux/pci.h>
   65.13 -#include <linux/init.h>
   65.14 -#include <linux/etherdevice.h>
   65.15 -#include <linux/delay.h>
   65.16 -#include <linux/mii.h>
   65.17 -#include <linux/ethtool.h>
   65.18 -#include <linux/crc32.h>
   65.19 +#include <xeno/pci.h>
   65.20 +#include <xeno/init.h>
   65.21 +#include <xeno/etherdevice.h>
   65.22 +#include <xeno/delay.h>
   65.23 +#include <xeno/mii.h>
   65.24 +#include <xeno/ethtool.h>
   65.25 +#include <xeno/crc32.h>
   65.26  #include <asm/unaligned.h>
   65.27  #include <asm/uaccess.h>
   65.28  
    66.1 --- a/xen/drivers/pci/compat.c	Wed Mar 10 14:41:38 2004 +0000
    66.2 +++ b/xen/drivers/pci/compat.c	Wed Mar 10 16:07:13 2004 +0000
    66.3 @@ -6,9 +6,9 @@
    66.4   *	Copyright 1998--2000 Martin Mares <mj@ucw.cz>
    66.5   */
    66.6  
    66.7 -#include <linux/types.h>
    66.8 -//#include <linux/kernel.h>
    66.9 -#include <linux/pci.h>
   66.10 +#include <xeno/types.h>
   66.11 +//#include <xeno/kernel.h>
   66.12 +#include <xeno/pci.h>
   66.13  
   66.14  int
   66.15  pcibios_present(void)
    67.1 --- a/xen/drivers/pci/names.c	Wed Mar 10 14:41:38 2004 +0000
    67.2 +++ b/xen/drivers/pci/names.c	Wed Mar 10 16:07:13 2004 +0000
    67.3 @@ -5,11 +5,11 @@
    67.4   *	David Mosberger-Tang, Martin Mares
    67.5   */
    67.6  
    67.7 -#include <linux/config.h>
    67.8 -#include <linux/types.h>
    67.9 -/*#include <linux/kernel.h>*/
   67.10 -#include <linux/pci.h>
   67.11 -#include <linux/init.h>
   67.12 +#include <xeno/config.h>
   67.13 +#include <xeno/types.h>
   67.14 +/*#include <xeno/kernel.h>*/
   67.15 +#include <xeno/pci.h>
   67.16 +#include <xeno/init.h>
   67.17  
   67.18  #ifdef CONFIG_PCI_NAMES
   67.19  
    68.1 --- a/xen/drivers/pci/pci.c	Wed Mar 10 14:41:38 2004 +0000
    68.2 +++ b/xen/drivers/pci/pci.c	Wed Mar 10 16:07:13 2004 +0000
    68.3 @@ -9,22 +9,22 @@
    68.4   *	Copyright 1997 -- 2000 Martin Mares <mj@ucw.cz>
    68.5   */
    68.6  
    68.7 -#include <linux/config.h>
    68.8 -#include <linux/sched.h>
    68.9 -#include <linux/module.h>
   68.10 -#include <linux/types.h>
   68.11 -/*#include <linux/kernel.h>*/
   68.12 -#include <linux/pci.h>
   68.13 -/*#include <linux/string.h>*/
   68.14 -#include <linux/init.h>
   68.15 -#include <linux/slab.h>
   68.16 -#include <linux/ioport.h>
   68.17 -#include <linux/spinlock.h>
   68.18 -/*#include <linux/pm.h>*/
   68.19 -/*#include <linux/kmod.h>*/		/* for hotplug_path */
   68.20 -/*#include <linux/bitops.h>*/
   68.21 -#include <linux/delay.h>
   68.22 -#include <linux/cache.h>
   68.23 +#include <xeno/config.h>
   68.24 +#include <xeno/sched.h>
   68.25 +#include <xeno/module.h>
   68.26 +#include <xeno/types.h>
   68.27 +/*#include <xeno/kernel.h>*/
   68.28 +#include <xeno/pci.h>
   68.29 +/*#include <xeno/string.h>*/
   68.30 +#include <xeno/init.h>
   68.31 +#include <xeno/slab.h>
   68.32 +#include <xeno/ioport.h>
   68.33 +#include <xeno/spinlock.h>
   68.34 +/*#include <xeno/pm.h>*/
   68.35 +/*#include <xeno/kmod.h>*/		/* for hotplug_path */
   68.36 +/*#include <xeno/bitops.h>*/
   68.37 +#include <xeno/delay.h>
   68.38 +#include <xeno/cache.h>
   68.39  
   68.40  #include <asm/page.h>
   68.41  /*#include <asm/dma.h>*/	/* isa_dma_bridge_buggy */
    69.1 --- a/xen/drivers/pci/proc.c	Wed Mar 10 14:41:38 2004 +0000
    69.2 +++ b/xen/drivers/pci/proc.c	Wed Mar 10 16:07:13 2004 +0000
    69.3 @@ -6,12 +6,12 @@
    69.4   *	Copyright (c) 1997--1999 Martin Mares <mj@ucw.cz>
    69.5   */
    69.6  
    69.7 -#include <linux/types.h>
    69.8 -#include <linux/kernel.h>
    69.9 -#include <linux/pci.h>
   69.10 -#include <linux/proc_fs.h>
   69.11 -#include <linux/init.h>
   69.12 -#include <linux/seq_file.h>
   69.13 +#include <xeno/types.h>
   69.14 +#include <xeno/kernel.h>
   69.15 +#include <xeno/pci.h>
   69.16 +#include <xeno/proc_fs.h>
   69.17 +#include <xeno/init.h>
   69.18 +#include <xeno/seq_file.h>
   69.19  
   69.20  #include <asm/uaccess.h>
   69.21  #include <asm/byteorder.h>
    70.1 --- a/xen/drivers/pci/quirks.c	Wed Mar 10 14:41:38 2004 +0000
    70.2 +++ b/xen/drivers/pci/quirks.c	Wed Mar 10 16:07:13 2004 +0000
    70.3 @@ -12,12 +12,12 @@
    70.4   *  use the PowerTweak utility (see http://powertweak.sourceforge.net).
    70.5   */
    70.6  
    70.7 -#include <linux/config.h>
    70.8 -#include <linux/types.h>
    70.9 -#include <linux/lib.h>
   70.10 -#include <linux/pci.h>
   70.11 -#include <linux/init.h>
   70.12 -#include <linux/delay.h>
   70.13 +#include <xeno/config.h>
   70.14 +#include <xeno/types.h>
   70.15 +#include <xeno/lib.h>
   70.16 +#include <xeno/pci.h>
   70.17 +#include <xeno/init.h>
   70.18 +#include <xeno/delay.h>
   70.19  
   70.20  #undef DEBUG
   70.21  
    71.1 --- a/xen/drivers/pci/setup-bus.c	Wed Mar 10 14:41:38 2004 +0000
    71.2 +++ b/xen/drivers/pci/setup-bus.c	Wed Mar 10 16:07:13 2004 +0000
    71.3 @@ -17,13 +17,13 @@
    71.4   *	     tighter packing. Prefetchable range support.
    71.5   */
    71.6  
    71.7 -#include <linux/init.h>
    71.8 -#include <linux/kernel.h>
    71.9 -#include <linux/pci.h>
   71.10 -#include <linux/errno.h>
   71.11 -#include <linux/ioport.h>
   71.12 -#include <linux/cache.h>
   71.13 -#include <linux/slab.h>
   71.14 +#include <xeno/init.h>
   71.15 +#include <xeno/kernel.h>
   71.16 +#include <xeno/pci.h>
   71.17 +#include <xeno/errno.h>
   71.18 +#include <xeno/ioport.h>
   71.19 +#include <xeno/cache.h>
   71.20 +#include <xeno/slab.h>
   71.21  
   71.22  
   71.23  #define DEBUG_CONFIG 1
    72.1 --- a/xen/drivers/pci/setup-irq.c	Wed Mar 10 14:41:38 2004 +0000
    72.2 +++ b/xen/drivers/pci/setup-irq.c	Wed Mar 10 16:07:13 2004 +0000
    72.3 @@ -10,12 +10,12 @@
    72.4   */
    72.5  
    72.6  
    72.7 -#include <linux/init.h>
    72.8 -#include <linux/kernel.h>
    72.9 -#include <linux/pci.h>
   72.10 -#include <linux/errno.h>
   72.11 -#include <linux/ioport.h>
   72.12 -#include <linux/cache.h>
   72.13 +#include <xeno/init.h>
   72.14 +#include <xeno/kernel.h>
   72.15 +#include <xeno/pci.h>
   72.16 +#include <xeno/errno.h>
   72.17 +#include <xeno/ioport.h>
   72.18 +#include <xeno/cache.h>
   72.19  
   72.20  
   72.21  #define DEBUG_CONFIG 0
    73.1 --- a/xen/drivers/pci/setup-res.c	Wed Mar 10 14:41:38 2004 +0000
    73.2 +++ b/xen/drivers/pci/setup-res.c	Wed Mar 10 16:07:13 2004 +0000
    73.3 @@ -16,13 +16,13 @@
    73.4   *	     Resource sorting
    73.5   */
    73.6  
    73.7 -#include <linux/init.h>
    73.8 -#include <linux/lib.h>
    73.9 -#include <linux/pci.h>
   73.10 -#include <linux/errno.h>
   73.11 -#include <linux/ioport.h>
   73.12 -#include <linux/cache.h>
   73.13 -#include <linux/slab.h>
   73.14 +#include <xeno/init.h>
   73.15 +#include <xeno/lib.h>
   73.16 +#include <xeno/pci.h>
   73.17 +#include <xeno/errno.h>
   73.18 +#include <xeno/ioport.h>
   73.19 +#include <xeno/cache.h>
   73.20 +#include <xeno/slab.h>
   73.21  
   73.22  
   73.23  #define DEBUG_CONFIG 0
    74.1 --- a/xen/drivers/pci/syscall.c	Wed Mar 10 14:41:38 2004 +0000
    74.2 +++ b/xen/drivers/pci/syscall.c	Wed Mar 10 16:07:13 2004 +0000
    74.3 @@ -7,10 +7,10 @@
    74.4   * magic northbridge registers..
    74.5   */
    74.6  
    74.7 -#include <linux/sched.h>
    74.8 -#include <linux/errno.h>
    74.9 -#include <linux/pci.h>
   74.10 -#include <linux/smp_lock.h>
   74.11 +#include <xeno/sched.h>
   74.12 +#include <xeno/errno.h>
   74.13 +#include <xeno/pci.h>
   74.14 +#include <xeno/smp_lock.h>
   74.15  #include <asm/uaccess.h>
   74.16  
   74.17  
    75.1 --- a/xen/drivers/scsi/BusLogic.c	Wed Mar 10 14:41:38 2004 +0000
    75.2 +++ b/xen/drivers/scsi/BusLogic.c	Wed Mar 10 16:07:13 2004 +0000
    75.3 @@ -30,20 +30,20 @@
    75.4  #define BusLogic_DriverDate		"17 August 1998"
    75.5  
    75.6  
    75.7 -#include <linux/version.h>
    75.8 -#include <linux/module.h>
    75.9 -#include <linux/config.h>
   75.10 -#include <linux/init.h>
   75.11 -#include <linux/types.h>
   75.12 -#include <linux/blk.h>
   75.13 -#include <linux/blkdev.h>
   75.14 -#include <linux/delay.h>
   75.15 -#include <linux/ioport.h>
   75.16 -#include <linux/mm.h>
   75.17 -#include <linux/sched.h>
   75.18 -/*#include <linux/stat.h>*/
   75.19 -#include <linux/pci.h>
   75.20 -#include <linux/spinlock.h>
   75.21 +#include <xeno/version.h>
   75.22 +#include <xeno/module.h>
   75.23 +#include <xeno/config.h>
   75.24 +#include <xeno/init.h>
   75.25 +#include <xeno/types.h>
   75.26 +#include <xeno/blk.h>
   75.27 +#include <xeno/blkdev.h>
   75.28 +#include <xeno/delay.h>
   75.29 +#include <xeno/ioport.h>
   75.30 +#include <xeno/mm.h>
   75.31 +#include <xeno/sched.h>
   75.32 +/*#include <xeno/stat.h>*/
   75.33 +#include <xeno/pci.h>
   75.34 +#include <xeno/spinlock.h>
   75.35  #include <asm/dma.h>
   75.36  #include <asm/io.h>
   75.37  #include <asm/system.h>
    76.1 --- a/xen/drivers/scsi/BusLogic.h	Wed Mar 10 14:41:38 2004 +0000
    76.2 +++ b/xen/drivers/scsi/BusLogic.h	Wed Mar 10 16:07:13 2004 +0000
    76.3 @@ -26,7 +26,7 @@
    76.4  */
    76.5  
    76.6  
    76.7 -#include <linux/config.h>
    76.8 +#include <xeno/config.h>
    76.9  
   76.10  
   76.11  /*
    77.1 --- a/xen/drivers/scsi/FlashPoint.c.inc	Wed Mar 10 14:41:38 2004 +0000
    77.2 +++ b/xen/drivers/scsi/FlashPoint.c.inc	Wed Mar 10 16:07:13 2004 +0000
    77.3 @@ -16,7 +16,7 @@
    77.4  */
    77.5  
    77.6  
    77.7 -#include <linux/config.h>
    77.8 +#include <xeno/config.h>
    77.9  
   77.10  
   77.11  #ifndef CONFIG_SCSI_OMIT_FLASHPOINT
    78.1 --- a/xen/drivers/scsi/aacraid/aachba.c	Wed Mar 10 14:41:38 2004 +0000
    78.2 +++ b/xen/drivers/scsi/aacraid/aachba.c	Wed Mar 10 16:07:13 2004 +0000
    78.3 @@ -22,20 +22,20 @@
    78.4   *
    78.5   */
    78.6  
    78.7 -#include <linux/config.h>
    78.8 -#include <linux/module.h>
    78.9 -#include <linux/kernel.h>
   78.10 -#include <linux/init.h>
   78.11 -#include <linux/types.h>
   78.12 -#include <linux/sched.h>
   78.13 -#include <linux/pci.h>
   78.14 -#include <linux/spinlock.h>
   78.15 -#include <linux/slab.h>
   78.16 -/*#include <linux/completion.h>*/
   78.17 +#include <xeno/config.h>
   78.18 +#include <xeno/module.h>
   78.19 +#include <xeno/kernel.h>
   78.20 +#include <xeno/init.h>
   78.21 +#include <xeno/types.h>
   78.22 +#include <xeno/sched.h>
   78.23 +#include <xeno/pci.h>
   78.24 +#include <xeno/spinlock.h>
   78.25 +#include <xeno/slab.h>
   78.26 +/*#include <xeno/completion.h>*/
   78.27  /*#include <asm/semaphore.h>*/
   78.28  #include <asm/uaccess.h>
   78.29  #define MAJOR_NR SCSI_DISK0_MAJOR	/* For DEVICE_NR() */
   78.30 -#include <linux/blk.h>
   78.31 +#include <xeno/blk.h>
   78.32  #include "scsi.h"
   78.33  #include "hosts.h"
   78.34  #include "sd.h"
    79.1 --- a/xen/drivers/scsi/aacraid/commctrl.c	Wed Mar 10 14:41:38 2004 +0000
    79.2 +++ b/xen/drivers/scsi/aacraid/commctrl.c	Wed Mar 10 16:07:13 2004 +0000
    79.3 @@ -28,16 +28,16 @@
    79.4   *
    79.5   */
    79.6  
    79.7 -#include <linux/config.h>
    79.8 -#include <linux/kernel.h>
    79.9 -#include <linux/init.h>
   79.10 -#include <linux/types.h>
   79.11 -#include <linux/sched.h>
   79.12 -#include <linux/pci.h>
   79.13 -#include <linux/spinlock.h>
   79.14 -#include <linux/slab.h>
   79.15 -/*#include <linux/completion.h>*/
   79.16 -#include <linux/blk.h>
   79.17 +#include <xeno/config.h>
   79.18 +#include <xeno/kernel.h>
   79.19 +#include <xeno/init.h>
   79.20 +#include <xeno/types.h>
   79.21 +#include <xeno/sched.h>
   79.22 +#include <xeno/pci.h>
   79.23 +#include <xeno/spinlock.h>
   79.24 +#include <xeno/slab.h>
   79.25 +/*#include <xeno/completion.h>*/
   79.26 +#include <xeno/blk.h>
   79.27  /*#include <asm/semaphore.h>*/
   79.28  #include <asm/uaccess.h>
   79.29  #include "scsi.h"
    80.1 --- a/xen/drivers/scsi/aacraid/comminit.c	Wed Mar 10 14:41:38 2004 +0000
    80.2 +++ b/xen/drivers/scsi/aacraid/comminit.c	Wed Mar 10 16:07:13 2004 +0000
    80.3 @@ -29,17 +29,17 @@
    80.4   *
    80.5   */
    80.6  
    80.7 -#include <linux/config.h>
    80.8 -#include <linux/kernel.h>
    80.9 -#include <linux/init.h>
   80.10 -#include <linux/types.h>
   80.11 -#include <linux/sched.h>
   80.12 -#include <linux/pci.h>
   80.13 -#include <linux/spinlock.h>
   80.14 -#include <linux/slab.h>
   80.15 -#include <linux/blk.h>
   80.16 -/*#include <linux/completion.h>*/
   80.17 -#include <linux/mm.h>
   80.18 +#include <xeno/config.h>
   80.19 +#include <xeno/kernel.h>
   80.20 +#include <xeno/init.h>
   80.21 +#include <xeno/types.h>
   80.22 +#include <xeno/sched.h>
   80.23 +#include <xeno/pci.h>
   80.24 +#include <xeno/spinlock.h>
   80.25 +#include <xeno/slab.h>
   80.26 +#include <xeno/blk.h>
   80.27 +/*#include <xeno/completion.h>*/
   80.28 +#include <xeno/mm.h>
   80.29  /*#include <asm/semaphore.h>*/
   80.30  #include "scsi.h"
   80.31  #include "hosts.h"
    81.1 --- a/xen/drivers/scsi/aacraid/commsup.c	Wed Mar 10 14:41:38 2004 +0000
    81.2 +++ b/xen/drivers/scsi/aacraid/commsup.c	Wed Mar 10 16:07:13 2004 +0000
    81.3 @@ -31,17 +31,17 @@
    81.4   *
    81.5   */
    81.6  
    81.7 -#include <linux/config.h>
    81.8 -#include <linux/kernel.h>
    81.9 -#include <linux/init.h>
   81.10 -#include <linux/types.h>
   81.11 -#include <linux/sched.h>
   81.12 -#include <linux/pci.h>
   81.13 -#include <linux/spinlock.h>
   81.14 -#include <linux/slab.h>
   81.15 -/*#include <linux/completion.h>*/
   81.16 +#include <xeno/config.h>
   81.17 +#include <xeno/kernel.h>
   81.18 +#include <xeno/init.h>
   81.19 +#include <xeno/types.h>
   81.20 +#include <xeno/sched.h>
   81.21 +#include <xeno/pci.h>
   81.22 +#include <xeno/spinlock.h>
   81.23 +#include <xeno/slab.h>
   81.24 +/*#include <xeno/completion.h>*/
   81.25  /*#include <asm/semaphore.h>*/
   81.26 -#include <linux/blk.h>
   81.27 +#include <xeno/blk.h>
   81.28  #include <asm/uaccess.h>
   81.29  
   81.30  #include <xeno/interrupt.h>
    82.1 --- a/xen/drivers/scsi/aacraid/dpcsup.c	Wed Mar 10 14:41:38 2004 +0000
    82.2 +++ b/xen/drivers/scsi/aacraid/dpcsup.c	Wed Mar 10 16:07:13 2004 +0000
    82.3 @@ -29,16 +29,16 @@
    82.4   *
    82.5   */
    82.6  
    82.7 -#include <linux/config.h>
    82.8 -#include <linux/kernel.h>
    82.9 -#include <linux/init.h>
   82.10 -#include <linux/types.h>
   82.11 -#include <linux/sched.h>
   82.12 -#include <linux/pci.h>
   82.13 -#include <linux/spinlock.h>
   82.14 -#include <linux/slab.h>
   82.15 -/*#include <linux/completion.h>*/
   82.16 -#include <linux/blk.h>
   82.17 +#include <xeno/config.h>
   82.18 +#include <xeno/kernel.h>
   82.19 +#include <xeno/init.h>
   82.20 +#include <xeno/types.h>
   82.21 +#include <xeno/sched.h>
   82.22 +#include <xeno/pci.h>
   82.23 +#include <xeno/spinlock.h>
   82.24 +#include <xeno/slab.h>
   82.25 +/*#include <xeno/completion.h>*/
   82.26 +#include <xeno/blk.h>
   82.27  /*#include <asm/semaphore.h>*/
   82.28  #include "scsi.h"
   82.29  #include "hosts.h"
    83.1 --- a/xen/drivers/scsi/aacraid/linit.c	Wed Mar 10 14:41:38 2004 +0000
    83.2 +++ b/xen/drivers/scsi/aacraid/linit.c	Wed Mar 10 16:07:13 2004 +0000
    83.3 @@ -38,18 +38,18 @@
    83.4  #define AAC_DRIVER_VERSION		"1.1.2"
    83.5  #define AAC_DRIVER_BUILD_DATE		__DATE__ " " __TIME__
    83.6  
    83.7 -#include <linux/module.h>
    83.8 -#include <linux/config.h>
    83.9 -#include <linux/kernel.h>
   83.10 -#include <linux/init.h>
   83.11 -#include <linux/types.h>
   83.12 -#include <linux/sched.h>
   83.13 -#include <linux/pci.h>
   83.14 -#include <linux/spinlock.h>
   83.15 -#include <linux/slab.h>
   83.16 -/*#include <linux/completion.h>*/
   83.17 +#include <xeno/module.h>
   83.18 +#include <xeno/config.h>
   83.19 +#include <xeno/kernel.h>
   83.20 +#include <xeno/init.h>
   83.21 +#include <xeno/types.h>
   83.22 +#include <xeno/sched.h>
   83.23 +#include <xeno/pci.h>
   83.24 +#include <xeno/spinlock.h>
   83.25 +#include <xeno/slab.h>
   83.26 +/*#include <xeno/completion.h>*/
   83.27  /*#include <asm/semaphore.h>*/
   83.28 -#include <linux/blk.h>
   83.29 +#include <xeno/blk.h>
   83.30  #include "scsi.h"
   83.31  #include "hosts.h"
   83.32  
    84.1 --- a/xen/drivers/scsi/aacraid/rx.c	Wed Mar 10 14:41:38 2004 +0000
    84.2 +++ b/xen/drivers/scsi/aacraid/rx.c	Wed Mar 10 16:07:13 2004 +0000
    84.3 @@ -28,17 +28,17 @@
    84.4   *
    84.5   */
    84.6  
    84.7 -#include <linux/config.h>
    84.8 -#include <linux/kernel.h>
    84.9 -#include <linux/init.h>
   84.10 -#include <linux/types.h>
   84.11 -#include <linux/sched.h>
   84.12 -#include <linux/pci.h>
   84.13 -#include <linux/spinlock.h>
   84.14 -#include <linux/slab.h>
   84.15 -#include <linux/blk.h>
   84.16 -#include <linux/delay.h>
   84.17 -/*#include <linux/completion.h>*/
   84.18 +#include <xeno/config.h>
   84.19 +#include <xeno/kernel.h>
   84.20 +#include <xeno/init.h>
   84.21 +#include <xeno/types.h>
   84.22 +#include <xeno/sched.h>
   84.23 +#include <xeno/pci.h>
   84.24 +#include <xeno/spinlock.h>
   84.25 +#include <xeno/slab.h>
   84.26 +#include <xeno/blk.h>
   84.27 +#include <xeno/delay.h>
   84.28 +/*#include <xeno/completion.h>*/
   84.29  /*#include <asm/semaphore.h>*/
   84.30  #include "scsi.h"
   84.31  #include "hosts.h"
    85.1 --- a/xen/drivers/scsi/aacraid/sa.c	Wed Mar 10 14:41:38 2004 +0000
    85.2 +++ b/xen/drivers/scsi/aacraid/sa.c	Wed Mar 10 16:07:13 2004 +0000
    85.3 @@ -28,17 +28,17 @@
    85.4   *
    85.5   */
    85.6  
    85.7 -#include <linux/config.h>
    85.8 -#include <linux/kernel.h>
    85.9 -#include <linux/init.h>
   85.10 -#include <linux/types.h>
   85.11 -#include <linux/sched.h>
   85.12 -#include <linux/pci.h>
   85.13 -#include <linux/spinlock.h>
   85.14 -#include <linux/slab.h>
   85.15 -#include <linux/blk.h>
   85.16 -#include <linux/delay.h>
   85.17 -/*#include <linux/completion.h>*/
   85.18 +#include <xeno/config.h>
   85.19 +#include <xeno/kernel.h>
   85.20 +#include <xeno/init.h>
   85.21 +#include <xeno/types.h>
   85.22 +#include <xeno/sched.h>
   85.23 +#include <xeno/pci.h>
   85.24 +#include <xeno/spinlock.h>
   85.25 +#include <xeno/slab.h>
   85.26 +#include <xeno/blk.h>
   85.27 +#include <xeno/delay.h>
   85.28 +/*#include <xeno/completion.h>*/
   85.29  /*#include <asm/semaphore.h>*/
   85.30  #include "scsi.h"
   85.31  #include "hosts.h"
    86.1 --- a/xen/drivers/scsi/constants.c	Wed Mar 10 14:41:38 2004 +0000
    86.2 +++ b/xen/drivers/scsi/constants.c	Wed Mar 10 16:07:13 2004 +0000
    86.3 @@ -10,7 +10,7 @@
    86.4  
    86.5  #include <xeno/config.h>
    86.6  #include <xeno/blk.h>
    86.7 -/*#include <linux/kernel.h> */
    86.8 +/*#include <xeno/kernel.h> */
    86.9  #include "scsi.h"
   86.10  #include "hosts.h"
   86.11  
    87.1 --- a/xen/drivers/scsi/scsi_dma.c	Wed Mar 10 14:41:38 2004 +0000
    87.2 +++ b/xen/drivers/scsi/scsi_dma.c	Wed Mar 10 16:07:13 2004 +0000
    87.3 @@ -16,7 +16,7 @@
    87.4  #include "constants.h"
    87.5  
    87.6  #ifdef CONFIG_KMOD
    87.7 -#include <linux/kmod.h>
    87.8 +#include <xeno/kmod.h>
    87.9  #endif
   87.10  
   87.11  /*
    88.1 --- a/xen/drivers/scsi/scsi_ioctl.c	Wed Mar 10 14:41:38 2004 +0000
    88.2 +++ b/xen/drivers/scsi/scsi_ioctl.c	Wed Mar 10 16:07:13 2004 +0000
    88.3 @@ -12,12 +12,12 @@
    88.4  #include <asm/system.h>
    88.5  #include <asm/page.h>
    88.6  
    88.7 -/*  #include <linux/interrupt.h> */
    88.8 -/*  #include <linux/errno.h> */
    88.9 -/*  #include <linux/kernel.h> */
   88.10 +/*  #include <xeno/interrupt.h> */
   88.11 +/*  #include <xeno/errno.h> */
   88.12 +/*  #include <xeno/kernel.h> */
   88.13  #include <xeno/sched.h>
   88.14 -/*  #include <linux/mm.h> */
   88.15 -/*  #include <linux/string.h> */
   88.16 +/*  #include <xeno/mm.h> */
   88.17 +/*  #include <xeno/string.h> */
   88.18  
   88.19  #include <xeno/blk.h>
   88.20  #include "scsi.h"
    89.1 --- a/xen/drivers/scsi/scsi_module.c.inc	Wed Mar 10 14:41:38 2004 +0000
    89.2 +++ b/xen/drivers/scsi/scsi_module.c.inc	Wed Mar 10 16:07:13 2004 +0000
    89.3 @@ -30,7 +30,7 @@
    89.4   */
    89.5  
    89.6  #include <xeno/module.h>
    89.7 -#include <linux/init.h>
    89.8 +#include <xeno/init.h>
    89.9  
   89.10  extern int scsi_register_module(int, void *);
   89.11  extern int scsi_unregister_module(int, void *);
    90.1 --- a/xen/drivers/scsi/scsi_obsolete.c	Wed Mar 10 14:41:38 2004 +0000
    90.2 +++ b/xen/drivers/scsi/scsi_obsolete.c	Wed Mar 10 16:07:13 2004 +0000
    90.3 @@ -47,18 +47,18 @@
    90.4   */
    90.5  
    90.6  #define __NO_VERSION__
    90.7 -#include <linux/module.h>
    90.8 +#include <xeno/module.h>
    90.9  
   90.10 -#include <linux/sched.h>
   90.11 -#include <linux/timer.h>
   90.12 -#include <linux/string.h>
   90.13 -#include <linux/slab.h>
   90.14 -#include <linux/ioport.h>
   90.15 -#include <linux/kernel.h>
   90.16 -/*#include <linux/stat.h>*/
   90.17 -#include <linux/blk.h>
   90.18 -#include <linux/interrupt.h>
   90.19 -#include <linux/delay.h>
   90.20 +#include <xeno/sched.h>
   90.21 +#include <xeno/timer.h>
   90.22 +#include <xeno/string.h>
   90.23 +#include <xeno/slab.h>
   90.24 +#include <xeno/ioport.h>
   90.25 +#include <xeno/kernel.h>
   90.26 +/*#include <xeno/stat.h>*/
   90.27 +#include <xeno/blk.h>
   90.28 +#include <xeno/interrupt.h>
   90.29 +#include <xeno/delay.h>
   90.30  
   90.31  #include <asm/system.h>
   90.32  #include <asm/irq.h>
    91.1 --- a/xen/drivers/scsi/scsi_scan.c	Wed Mar 10 14:41:38 2004 +0000
    91.2 +++ b/xen/drivers/scsi/scsi_scan.c	Wed Mar 10 16:07:13 2004 +0000
    91.3 @@ -20,7 +20,7 @@
    91.4  #include "constants.h"
    91.5  
    91.6  #ifdef CONFIG_KMOD
    91.7 -#include <linux/kmod.h>
    91.8 +#include <xeno/kmod.h>
    91.9  #endif
   91.10  
   91.11  /* 
    92.1 --- a/xen/drivers/scsi/scsicam.c	Wed Mar 10 14:41:38 2004 +0000
    92.2 +++ b/xen/drivers/scsi/scsicam.c	Wed Mar 10 16:07:13 2004 +0000
    92.3 @@ -16,10 +16,10 @@
    92.4  #include <xeno/module.h>
    92.5  
    92.6  
    92.7 -/*#include <linux/fs.h>*/
    92.8 -/*#include <linux/genhd.h>*/
    92.9 +/*#include <xeno/fs.h>*/
   92.10 +/*#include <xeno/genhd.h>*/
   92.11  #include <xeno/blk.h>
   92.12 -/*#include <linux/kernel.h>*/
   92.13 +/*#include <xeno/kernel.h>*/
   92.14  #include <asm/unaligned.h>
   92.15  #include "scsi.h"
   92.16  #include "hosts.h"
    93.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Wed Mar 10 14:41:38 2004 +0000
    93.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Wed Mar 10 16:07:13 2004 +0000
    93.3 @@ -51,7 +51,7 @@
    93.4   */
    93.5  #define SYM_GLUE_C
    93.6  
    93.7 -#include <linux/module.h>
    93.8 +#include <xeno/module.h>
    93.9  #include "sym_glue.h"
   93.10  
   93.11  #define NAME53C		"sym53c"
    94.1 --- a/xen/include/asm-i386/apic.h	Wed Mar 10 14:41:38 2004 +0000
    94.2 +++ b/xen/include/asm-i386/apic.h	Wed Mar 10 16:07:13 2004 +0000
    94.3 @@ -1,7 +1,7 @@
    94.4  #ifndef __ASM_APIC_H
    94.5  #define __ASM_APIC_H
    94.6  
    94.7 -#include <linux/config.h>
    94.8 +#include <xeno/config.h>
    94.9  #include <asm/ptrace.h>
   94.10  #include <asm/apicdef.h>
   94.11  #include <asm/system.h>
    95.1 --- a/xen/include/asm-i386/byteorder.h	Wed Mar 10 14:41:38 2004 +0000
    95.2 +++ b/xen/include/asm-i386/byteorder.h	Wed Mar 10 16:07:13 2004 +0000
    95.3 @@ -7,7 +7,7 @@
    95.4  
    95.5  /* For avoiding bswap on i386 */
    95.6  #ifdef __KERNEL__
    95.7 -#include <linux/config.h>
    95.8 +#include <xeno/config.h>
    95.9  #endif
   95.10  
   95.11  static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
   95.12 @@ -42,6 +42,6 @@ static __inline__ __const__ __u16 ___arc
   95.13  
   95.14  #endif /* __GNUC__ */
   95.15  
   95.16 -#include <linux/byteorder/little_endian.h>
   95.17 +#include <xeno/byteorder/little_endian.h>
   95.18  
   95.19  #endif /* _I386_BYTEORDER_H */
    96.1 --- a/xen/include/asm-i386/dma.h	Wed Mar 10 14:41:38 2004 +0000
    96.2 +++ b/xen/include/asm-i386/dma.h	Wed Mar 10 16:07:13 2004 +0000
    96.3 @@ -8,10 +8,10 @@
    96.4  #ifndef _ASM_DMA_H
    96.5  #define _ASM_DMA_H
    96.6  
    96.7 -#include <linux/config.h>
    96.8 -#include <linux/spinlock.h>	/* And spinlocks */
    96.9 +#include <xeno/config.h>
   96.10 +#include <xeno/spinlock.h>	/* And spinlocks */
   96.11  #include <asm/io.h>		/* need byte IO */
   96.12 -#include <linux/delay.h>
   96.13 +#include <xeno/delay.h>
   96.14  
   96.15  
   96.16  #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
    97.1 --- a/xen/include/asm-i386/ide.h	Wed Mar 10 14:41:38 2004 +0000
    97.2 +++ b/xen/include/asm-i386/ide.h	Wed Mar 10 16:07:13 2004 +0000
    97.3 @@ -13,7 +13,7 @@
    97.4  
    97.5  #ifdef __KERNEL__
    97.6  
    97.7 -#include <linux/config.h>
    97.8 +#include <xeno/config.h>
    97.9  
   97.10  #ifndef MAX_HWIFS
   97.11  # ifdef CONFIG_BLK_DEV_IDEPCI
    98.1 --- a/xen/include/asm-i386/io.h	Wed Mar 10 14:41:38 2004 +0000
    98.2 +++ b/xen/include/asm-i386/io.h	Wed Mar 10 16:07:13 2004 +0000
    98.3 @@ -6,7 +6,7 @@
    98.4  
    98.5  #define IO_SPACE_LIMIT 0xffff
    98.6  
    98.7 -/*#include <linux/vmalloc.h>*/
    98.8 +/*#include <xeno/vmalloc.h>*/
    98.9  
   98.10  /*
   98.11   * Temporary debugging check to catch old code using
    99.1 --- a/xen/include/asm-i386/pci.h	Wed Mar 10 14:41:38 2004 +0000
    99.2 +++ b/xen/include/asm-i386/pci.h	Wed Mar 10 16:07:13 2004 +0000
    99.3 @@ -1,7 +1,7 @@
    99.4  #ifndef __i386_PCI_H
    99.5  #define __i386_PCI_H
    99.6  
    99.7 -#include <linux/config.h>
    99.8 +#include <xeno/config.h>
    99.9  
   99.10  #ifdef __KERNEL__
   99.11  
   99.12 @@ -28,10 +28,10 @@ int pcibios_set_irq_routing(struct pci_d
   99.13   * i386 has everything mapped statically.
   99.14   */
   99.15  
   99.16 -#include <linux/types.h>
   99.17 -#include <linux/slab.h>
   99.18 +#include <xeno/types.h>
   99.19 +#include <xeno/slab.h>
   99.20  #include <asm/scatterlist.h>
   99.21 -/*#include <linux/string.h>*/
   99.22 +/*#include <xeno/string.h>*/
   99.23  #include <asm/io.h>
   99.24  
   99.25  struct pci_dev;
   100.1 --- a/xen/include/asm-i386/string.h	Wed Mar 10 14:41:38 2004 +0000
   100.2 +++ b/xen/include/asm-i386/string.h	Wed Mar 10 16:07:13 2004 +0000
   100.3 @@ -2,7 +2,7 @@
   100.4  #define _I386_STRING_H_
   100.5  
   100.6  #ifdef __KERNEL__
   100.7 -#include <linux/config.h>
   100.8 +#include <xeno/config.h>
   100.9  /*
  100.10   * On a 486 or Pentium, we are better off not using the
  100.11   * byte string operations. But on a 386 or a PPro the
   101.1 --- a/xen/include/asm-i386/timex.h	Wed Mar 10 14:41:38 2004 +0000
   101.2 +++ b/xen/include/asm-i386/timex.h	Wed Mar 10 16:07:13 2004 +0000
   101.3 @@ -6,7 +6,7 @@
   101.4  #ifndef _ASMi386_TIMEX_H
   101.5  #define _ASMi386_TIMEX_H
   101.6  
   101.7 -#include <linux/config.h>
   101.8 +#include <xeno/config.h>
   101.9  #include <asm/msr.h>
  101.10  
  101.11  #ifdef CONFIG_MELAN
   102.1 --- a/xen/include/asm-i386/uaccess.h	Wed Mar 10 14:41:38 2004 +0000
   102.2 +++ b/xen/include/asm-i386/uaccess.h	Wed Mar 10 16:07:13 2004 +0000
   102.3 @@ -4,10 +4,10 @@
   102.4  /*
   102.5   * User space memory access functions
   102.6   */
   102.7 -#include <linux/config.h>
   102.8 -#include <linux/errno.h>
   102.9 -#include <linux/sched.h>
  102.10 -#include <linux/prefetch.h>
  102.11 +#include <xeno/config.h>
  102.12 +#include <xeno/errno.h>
  102.13 +#include <xeno/sched.h>
  102.14 +#include <xeno/prefetch.h>
  102.15  #include <asm/page.h>
  102.16  
  102.17  #define VERIFY_READ 0
   103.1 --- a/xen/include/asm-x86_64/apic.h	Wed Mar 10 14:41:38 2004 +0000
   103.2 +++ b/xen/include/asm-x86_64/apic.h	Wed Mar 10 16:07:13 2004 +0000
   103.3 @@ -1,7 +1,7 @@
   103.4  #ifndef __ASM_APIC_H
   103.5  #define __ASM_APIC_H
   103.6  
   103.7 -#include <linux/config.h>
   103.8 +#include <xeno/config.h>
   103.9  #include <asm/ptrace.h>
  103.10  #include <asm/apicdef.h>
  103.11  #include <asm/system.h>
   104.1 --- a/xen/include/asm-x86_64/byteorder.h	Wed Mar 10 14:41:38 2004 +0000
   104.2 +++ b/xen/include/asm-x86_64/byteorder.h	Wed Mar 10 16:07:13 2004 +0000
   104.3 @@ -27,6 +27,6 @@ static __inline__ __const__ __u32 ___arc
   104.4  
   104.5  #define __BYTEORDER_HAS_U64__
   104.6  
   104.7 -#include <linux/byteorder/little_endian.h>
   104.8 +#include <xeno/byteorder/little_endian.h>
   104.9  
  104.10  #endif /* _X86_64_BYTEORDER_H */
   105.1 --- a/xen/include/asm-x86_64/dma.h	Wed Mar 10 14:41:38 2004 +0000
   105.2 +++ b/xen/include/asm-x86_64/dma.h	Wed Mar 10 16:07:13 2004 +0000
   105.3 @@ -8,10 +8,10 @@
   105.4  #ifndef _ASM_DMA_H
   105.5  #define _ASM_DMA_H
   105.6  
   105.7 -#include <linux/config.h>
   105.8 -#include <linux/spinlock.h>	/* And spinlocks */
   105.9 +#include <xeno/config.h>
  105.10 +#include <xeno/spinlock.h>	/* And spinlocks */
  105.11  #include <asm/io.h>		/* need byte IO */
  105.12 -#include <linux/delay.h>
  105.13 +#include <xeno/delay.h>
  105.14  
  105.15  
  105.16  #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
   106.1 --- a/xen/include/asm-x86_64/ide.h	Wed Mar 10 14:41:38 2004 +0000
   106.2 +++ b/xen/include/asm-x86_64/ide.h	Wed Mar 10 16:07:13 2004 +0000
   106.3 @@ -13,7 +13,7 @@
   106.4  
   106.5  #ifdef __KERNEL__
   106.6  
   106.7 -#include <linux/config.h>
   106.8 +#include <xeno/config.h>
   106.9  
  106.10  #ifndef MAX_HWIFS
  106.11  # ifdef CONFIG_BLK_DEV_IDEPCI
   107.1 --- a/xen/include/asm-x86_64/io.h	Wed Mar 10 14:41:38 2004 +0000
   107.2 +++ b/xen/include/asm-x86_64/io.h	Wed Mar 10 16:07:13 2004 +0000
   107.3 @@ -1,7 +1,7 @@
   107.4  #ifndef _ASM_IO_H
   107.5  #define _ASM_IO_H
   107.6  
   107.7 -#include <linux/config.h>
   107.8 +#include <xeno/config.h>
   107.9  
  107.10  /*
  107.11   * This file contains the definitions for the x86 IO instructions
   108.1 --- a/xen/include/asm-x86_64/page.h	Wed Mar 10 14:41:38 2004 +0000
   108.2 +++ b/xen/include/asm-x86_64/page.h	Wed Mar 10 16:07:13 2004 +0000
   108.3 @@ -191,7 +191,7 @@ extern void paging_init(void);
   108.4  #define __flush_tlb_one(__addr) \
   108.5  __asm__ __volatile__("invlpg %0": :"m" (*(char *) (__addr)))
   108.6  
   108.7 -#include <linux/config.h>
   108.8 +#include <xeno/config.h>
   108.9  
  108.10  /*
  108.11   * Tell the user there is some problem.  The exception handler decodes this frame.
   109.1 --- a/xen/include/asm-x86_64/pci.h	Wed Mar 10 14:41:38 2004 +0000
   109.2 +++ b/xen/include/asm-x86_64/pci.h	Wed Mar 10 16:07:13 2004 +0000
   109.3 @@ -1,7 +1,7 @@
   109.4  #ifndef __x8664_PCI_H
   109.5  #define __x8664_PCI_H
   109.6  
   109.7 -#include <linux/config.h>
   109.8 +#include <xeno/config.h>
   109.9  #include <asm/io.h>
  109.10  
  109.11  
  109.12 @@ -24,10 +24,10 @@ void pcibios_penalize_isa_irq(int irq);
  109.13  struct irq_routing_table *pcibios_get_irq_routing_table(void);
  109.14  int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
  109.15  
  109.16 -#include <linux/types.h>
  109.17 -#include <linux/slab.h>
  109.18 +#include <xeno/types.h>
  109.19 +#include <xeno/slab.h>
  109.20  #include <asm/scatterlist.h>
  109.21 -/*#include <linux/string.h>*/
  109.22 +/*#include <xeno/string.h>*/
  109.23  #include <asm/io.h>
  109.24  #include <asm/page.h>
  109.25  #include <asm/mmzone.h>
   110.1 --- a/xen/include/asm-x86_64/pda.h	Wed Mar 10 14:41:38 2004 +0000
   110.2 +++ b/xen/include/asm-x86_64/pda.h	Wed Mar 10 16:07:13 2004 +0000
   110.3 @@ -1,7 +1,7 @@
   110.4  #ifndef X86_64_PDA_H
   110.5  #define X86_64_PDA_H
   110.6  
   110.7 -#include <linux/cache.h>
   110.8 +#include <xeno/cache.h>
   110.9  
  110.10  /* Per processor datastructure. %gs points to it while the kernel runs */ 
  110.11  /* To use a new field with the *_pda macros it needs to be added to tools/offset.c */
   111.1 --- a/xen/include/asm-x86_64/timex.h	Wed Mar 10 14:41:38 2004 +0000
   111.2 +++ b/xen/include/asm-x86_64/timex.h	Wed Mar 10 16:07:13 2004 +0000
   111.3 @@ -6,7 +6,7 @@
   111.4  #ifndef _ASMx8664_TIMEX_H
   111.5  #define _ASMx8664_TIMEX_H
   111.6  
   111.7 -#include <linux/config.h>
   111.8 +#include <xeno/config.h>
   111.9  #include <asm/msr.h>
  111.10  
  111.11  #define CLOCK_TICK_RATE (vxtime_hz)
   112.1 --- a/xen/include/asm-x86_64/uaccess.h	Wed Mar 10 14:41:38 2004 +0000
   112.2 +++ b/xen/include/asm-x86_64/uaccess.h	Wed Mar 10 16:07:13 2004 +0000
   112.3 @@ -4,10 +4,10 @@
   112.4  /*
   112.5   * User space memory access functions
   112.6   */
   112.7 -#include <linux/config.h>
   112.8 -#include <linux/sched.h>
   112.9 -#include <linux/prefetch.h>
  112.10 -#include <linux/errno.h>
  112.11 +#include <xeno/config.h>
  112.12 +#include <xeno/sched.h>
  112.13 +#include <xeno/prefetch.h>
  112.14 +#include <xeno/errno.h>
  112.15  #include <asm/page.h>
  112.16  
  112.17  #define VERIFY_READ 0
   113.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   113.2 +++ b/xen/include/hypervisor-ifs/trace.h	Wed Mar 10 16:07:13 2004 +0000
   113.3 @@ -0,0 +1,35 @@
   113.4 +/******************************************************************************
   113.5 + * include/hypervisor-ifs/trace.h
   113.6 + */
   113.7 +
   113.8 +#ifndef __HYPERVISOR_IFS_TRACE_H__
   113.9 +#define __HYPERVISOR_IFS_TRACE_H__
  113.10 +
  113.11 +/* This structure represents a single trace buffer record. */
  113.12 +struct t_rec {
  113.13 +    u64 cycles;               /* 64 bit cycle counter timestamp */
  113.14 +    u32 event;                /* 32 bit event ID                */
  113.15 +    u32 d1, d2, d3, d4, d5;   /* event data items               */
  113.16 +};
  113.17 +
  113.18 +/*
  113.19 + * This structure contains the metadata for a single trace buffer.  The head
  113.20 + * field, indexes into an array of struct t_rec's.
  113.21 + */
  113.22 +struct t_buf {
  113.23 +    struct t_rec *data;     /* pointer to data area.  physical address
  113.24 +                             * for convenience in user space code            */
  113.25 +
  113.26 +    unsigned int size;      /* size of the data area, in t_recs              */
  113.27 +    unsigned int head;      /* array index of the most recent record         */
  113.28 +
  113.29 +#ifdef __KERNEL__
  113.30 +    struct t_rec *head_ptr; /* pointer to the head record                    */
  113.31 +    struct t_rec *vdata;    /* virtual address pointer to data               */
  113.32 +    spinlock_t lock;        /* ensure mutually exlusive access (for inserts) */
  113.33 +#endif
  113.34 +
  113.35 +    /* never add anything here - the kernel stuff must be the last elements */
  113.36 +};
  113.37 +
  113.38 +#endif /* __HYPERVISOR_IFS_TRACE_H__ */
   114.1 --- a/xen/include/xeno/brlock.h	Wed Mar 10 14:41:38 2004 +0000
   114.2 +++ b/xen/include/xeno/brlock.h	Wed Mar 10 16:07:13 2004 +0000
   114.3 @@ -38,12 +38,12 @@ enum brlock_indices {
   114.4  	__BR_END
   114.5  };
   114.6  
   114.7 -#include <linux/config.h>
   114.8 +#include <xeno/config.h>
   114.9  
  114.10  #ifdef CONFIG_SMP
  114.11  
  114.12 -#include <linux/cache.h>
  114.13 -#include <linux/spinlock.h>
  114.14 +#include <xeno/cache.h>
  114.15 +#include <xeno/spinlock.h>
  114.16  
  114.17  #if defined(__i386__) || defined(__ia64__) || defined(__x86_64__)
  114.18  #define __BRLOCK_USE_ATOMICS
   115.1 --- a/xen/include/xeno/byteorder/big_endian.h	Wed Mar 10 14:41:38 2004 +0000
   115.2 +++ b/xen/include/xeno/byteorder/big_endian.h	Wed Mar 10 16:07:13 2004 +0000
   115.3 @@ -8,7 +8,7 @@
   115.4  #define __BIG_ENDIAN_BITFIELD
   115.5  #endif
   115.6  
   115.7 -#include <linux/byteorder/swab.h>
   115.8 +#include <xeno/byteorder/swab.h>
   115.9  
  115.10  #define __constant_htonl(x) ((__u32)(x))
  115.11  #define __constant_ntohl(x) ((__u32)(x))
  115.12 @@ -63,6 +63,6 @@
  115.13  #define __cpu_to_be16s(x) do {} while (0)
  115.14  #define __be16_to_cpus(x) do {} while (0)
  115.15  
  115.16 -#include <linux/byteorder/generic.h>
  115.17 +#include <xeno/byteorder/generic.h>
  115.18  
  115.19  #endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */
   116.1 --- a/xen/include/xeno/byteorder/little_endian.h	Wed Mar 10 14:41:38 2004 +0000
   116.2 +++ b/xen/include/xeno/byteorder/little_endian.h	Wed Mar 10 16:07:13 2004 +0000
   116.3 @@ -8,7 +8,7 @@
   116.4  #define __LITTLE_ENDIAN_BITFIELD
   116.5  #endif
   116.6  
   116.7 -#include <linux/byteorder/swab.h>
   116.8 +#include <xeno/byteorder/swab.h>
   116.9  
  116.10  #define __constant_htonl(x) ___constant_swab32((x))
  116.11  #define __constant_ntohl(x) ___constant_swab32((x))
  116.12 @@ -63,6 +63,6 @@
  116.13  #define __cpu_to_be16s(x) __swab16s((x))
  116.14  #define __be16_to_cpus(x) __swab16s((x))
  116.15  
  116.16 -#include <linux/byteorder/generic.h>
  116.17 +#include <xeno/byteorder/generic.h>
  116.18  
  116.19  #endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */
   117.1 --- a/xen/include/xeno/byteorder/pdp_endian.h	Wed Mar 10 14:41:38 2004 +0000
   117.2 +++ b/xen/include/xeno/byteorder/pdp_endian.h	Wed Mar 10 16:07:13 2004 +0000
   117.3 @@ -27,8 +27,8 @@
   117.4  #define __PDP_ENDIAN_BITFIELD
   117.5  #endif
   117.6  
   117.7 -#include <linux/byteorder/swab.h>
   117.8 -#include <linux/byteorder/swabb.h>
   117.9 +#include <xeno/byteorder/swab.h>
  117.10 +#include <xeno/byteorder/swabb.h>
  117.11  
  117.12  #define __constant_htonl(x) ___constant_swahb32((x))
  117.13  #define __constant_ntohl(x) ___constant_swahb32((x))
  117.14 @@ -83,6 +83,6 @@
  117.15  #define __cpu_to_be16s(x) __swab16s((x))
  117.16  #define __be16_to_cpus(x) __swab16s((x))
  117.17  
  117.18 -#include <linux/byteorder/generic.h>
  117.19 +#include <xeno/byteorder/generic.h>
  117.20  
  117.21  #endif /* _LINUX_BYTEORDER_PDP_ENDIAN_H */
   118.1 --- a/xen/include/xeno/cdrom.h	Wed Mar 10 14:41:38 2004 +0000
   118.2 +++ b/xen/include/xeno/cdrom.h	Wed Mar 10 16:07:13 2004 +0000
   118.3 @@ -1,5 +1,5 @@
   118.4  /*
   118.5 - * -- <linux/cdrom.h>
   118.6 + * -- <xeno/cdrom.h>
   118.7   * General header file for linux CD-ROM drivers 
   118.8   * Copyright (C) 1992         David Giller, rafetmad@oxy.edu
   118.9   *               1994, 1995   Eberhard Moenkeberg, emoenke@gwdg.de
  118.10 @@ -716,7 +716,7 @@ struct request_sense {
  118.11  
  118.12  #ifdef __KERNEL__
  118.13  #if 0
  118.14 -#include <linux/devfs_fs_kernel.h>
  118.15 +#include <xeno/devfs_fs_kernel.h>
  118.16  #else
  118.17  #include <xeno/kdev_t.h>
  118.18  #endif
   119.1 --- a/xen/include/xeno/crc32.h	Wed Mar 10 14:41:38 2004 +0000
   119.2 +++ b/xen/include/xeno/crc32.h	Wed Mar 10 16:07:13 2004 +0000
   119.3 @@ -7,7 +7,7 @@
   119.4  #ifndef _LINUX_CRC32_H
   119.5  #define _LINUX_CRC32_H
   119.6  
   119.7 -#include <linux/types.h>
   119.8 +#include <xeno/types.h>
   119.9  
  119.10  /* The little-endian AUTODIN II ethernet CRC calculation.
  119.11     N.B. Do not use for bulk data, use a table-based routine instead.
   120.1 --- a/xen/include/xeno/etherdevice.h	Wed Mar 10 14:41:38 2004 +0000
   120.2 +++ b/xen/include/xeno/etherdevice.h	Wed Mar 10 16:07:13 2004 +0000
   120.3 @@ -24,7 +24,7 @@
   120.4  #ifndef _LINUX_ETHERDEVICE_H
   120.5  #define _LINUX_ETHERDEVICE_H
   120.6  
   120.7 -#include <linux/if_ether.h>
   120.8 +#include <xeno/if_ether.h>
   120.9  
  120.10  #ifdef __KERNEL__
  120.11  extern int		eth_header(struct sk_buff *skb, struct net_device *dev,
   121.1 --- a/xen/include/xeno/genhd.h	Wed Mar 10 14:41:38 2004 +0000
   121.2 +++ b/xen/include/xeno/genhd.h	Wed Mar 10 16:07:13 2004 +0000
   121.3 @@ -56,7 +56,7 @@ struct partition {
   121.4  } __attribute__((packed));
   121.5  
   121.6  #ifdef __KERNEL__
   121.7 -/*#  include <linux/devfs_fs_kernel.h>*/
   121.8 +/*#  include <xeno/devfs_fs_kernel.h>*/
   121.9  
  121.10  struct hd_struct {
  121.11  	unsigned long start_sect;
   122.1 --- a/xen/include/xeno/hdreg.h	Wed Mar 10 14:41:38 2004 +0000
   122.2 +++ b/xen/include/xeno/hdreg.h	Wed Mar 10 16:07:13 2004 +0000
   122.3 @@ -650,7 +650,7 @@ struct hd_driveid {
   122.4  /*
   122.5   * These routines are used for kernel command line parameters from main.c:
   122.6   */
   122.7 -#include <linux/config.h>
   122.8 +#include <xeno/config.h>
   122.9  
  122.10  #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
  122.11  int ide_register(int io_port, int ctl_port, int irq);
   123.1 --- a/xen/include/xeno/if.h	Wed Mar 10 14:41:38 2004 +0000
   123.2 +++ b/xen/include/xeno/if.h	Wed Mar 10 16:07:13 2004 +0000
   123.3 @@ -19,8 +19,8 @@
   123.4  #ifndef _LINUX_IF_H
   123.5  #define _LINUX_IF_H
   123.6  
   123.7 -#include <linux/types.h>		/* for "__kernel_caddr_t" et al	*/
   123.8 -#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
   123.9 +#include <xeno/types.h>		/* for "__kernel_caddr_t" et al	*/
  123.10 +#include <xeno/socket.h>		/* for "struct sockaddr" et al	*/
  123.11  
  123.12  /* Standard interface flags (netdevice->flags). */
  123.13  #define	IFF_UP		0x1		/* interface is up		*/
   124.1 --- a/xen/include/xeno/if_vlan.h	Wed Mar 10 14:41:38 2004 +0000
   124.2 +++ b/xen/include/xeno/if_vlan.h	Wed Mar 10 16:07:13 2004 +0000
   124.3 @@ -23,8 +23,8 @@ struct packet_type;
   124.4  struct vlan_collection;
   124.5  struct vlan_dev_info;
   124.6  
   124.7 -//#include <linux/proc_fs.h> /* for proc_dir_entry */
   124.8 -#include <linux/netdevice.h>
   124.9 +//#include <xeno/proc_fs.h> /* for proc_dir_entry */
  124.10 +#include <xeno/netdevice.h>
  124.11  
  124.12  #define VLAN_HLEN	4		/* The additional bytes (on top of the Ethernet header)
  124.13  					 * that VLAN requires.
   125.1 --- a/xen/include/xeno/init.h	Wed Mar 10 14:41:38 2004 +0000
   125.2 +++ b/xen/include/xeno/init.h	Wed Mar 10 16:07:13 2004 +0000
   125.3 @@ -1,7 +1,7 @@
   125.4  #ifndef _LINUX_INIT_H
   125.5  #define _LINUX_INIT_H
   125.6  
   125.7 -#include <linux/config.h>
   125.8 +#include <xeno/config.h>
   125.9  
  125.10  /* These macros are used to mark some functions or 
  125.11   * initialized data (doesn't apply to uninitialized data)
   126.1 --- a/xen/include/xeno/interrupt.h	Wed Mar 10 14:41:38 2004 +0000
   126.2 +++ b/xen/include/xeno/interrupt.h	Wed Mar 10 16:07:13 2004 +0000
   126.3 @@ -2,10 +2,10 @@
   126.4  #ifndef _LINUX_INTERRUPT_H
   126.5  #define _LINUX_INTERRUPT_H
   126.6  
   126.7 -#include <linux/config.h>
   126.8 -#include <linux/lib.h>
   126.9 -#include <linux/smp.h>
  126.10 -#include <linux/cache.h>
  126.11 +#include <xeno/config.h>
  126.12 +#include <xeno/lib.h>
  126.13 +#include <xeno/smp.h>
  126.14 +#include <xeno/cache.h>
  126.15  
  126.16  #include <asm/bitops.h>
  126.17  #include <asm/atomic.h>
   127.1 --- a/xen/include/xeno/mii.h	Wed Mar 10 14:41:38 2004 +0000
   127.2 +++ b/xen/include/xeno/mii.h	Wed Mar 10 16:07:13 2004 +0000
   127.3 @@ -8,7 +8,7 @@
   127.4  #ifndef __LINUX_MII_H__
   127.5  #define __LINUX_MII_H__
   127.6  
   127.7 -#include <linux/types.h>
   127.8 +#include <xeno/types.h>
   127.9  
  127.10  /* Generic MII registers. */
  127.11  
   128.1 --- a/xen/include/xeno/module.h	Wed Mar 10 14:41:38 2004 +0000
   128.2 +++ b/xen/include/xeno/module.h	Wed Mar 10 16:07:13 2004 +0000
   128.3 @@ -7,9 +7,9 @@
   128.4  #ifndef _LINUX_MODULE_H
   128.5  #define _LINUX_MODULE_H
   128.6  
   128.7 -#include <linux/config.h>
   128.8 -#include <linux/spinlock.h>
   128.9 -#include <linux/list.h>
  128.10 +#include <xeno/config.h>
  128.11 +#include <xeno/spinlock.h>
  128.12 +#include <xeno/list.h>
  128.13  
  128.14  #ifdef __GENKSYMS__
  128.15  #  define _set_ver(sym) sym
  128.16 @@ -18,7 +18,7 @@
  128.17  #else /* ! __GENKSYMS__ */
  128.18  # if !defined(MODVERSIONS) && defined(EXPORT_SYMTAB)
  128.19  #   define _set_ver(sym) sym
  128.20 -#   include <linux/modversions.h>
  128.21 +#   include <xeno/modversions.h>
  128.22  # endif
  128.23  #endif /* __GENKSYMS__ */
  128.24  
  128.25 @@ -303,7 +303,7 @@ extern struct module __this_module;
  128.26  #define MOD_IN_USE		__MOD_IN_USE(THIS_MODULE)
  128.27  
  128.28  #if 0
  128.29 -#include <linux/version.h>
  128.30 +#include <xeno/version.h>
  128.31  static const char __module_kernel_version[] __attribute__((section(".modinfo"))) =
  128.32  "kernel_version=" UTS_RELEASE;
  128.33  #ifdef MODVERSIONS
   129.1 --- a/xen/include/xeno/notifier.h	Wed Mar 10 14:41:38 2004 +0000
   129.2 +++ b/xen/include/xeno/notifier.h	Wed Mar 10 16:07:13 2004 +0000
   129.3 @@ -9,7 +9,7 @@
   129.4   
   129.5  #ifndef _LINUX_NOTIFIER_H
   129.6  #define _LINUX_NOTIFIER_H
   129.7 -#include <linux/errno.h>
   129.8 +#include <xeno/errno.h>
   129.9  
  129.10  struct notifier_block
  129.11  {
   130.1 --- a/xen/include/xeno/pci.h	Wed Mar 10 14:41:38 2004 +0000
   130.2 +++ b/xen/include/xeno/pci.h	Wed Mar 10 16:07:13 2004 +0000
   130.3 @@ -305,7 +305,7 @@
   130.4  
   130.5  /* Include the ID list */
   130.6  
   130.7 -#include <linux/pci_ids.h>
   130.8 +#include <xeno/pci_ids.h>
   130.9  
  130.10  /*
  130.11   * The PCI interface treats multi-function devices as independent
  130.12 @@ -328,11 +328,11 @@
  130.13  
  130.14  #ifdef __KERNEL__
  130.15  
  130.16 -#include <linux/types.h>
  130.17 -#include <linux/config.h>
  130.18 -#include <linux/ioport.h>
  130.19 -#include <linux/list.h>
  130.20 -#include <linux/errno.h>
  130.21 +#include <xeno/types.h>
  130.22 +#include <xeno/config.h>
  130.23 +#include <xeno/ioport.h>
  130.24 +#include <xeno/list.h>
  130.25 +#include <xeno/errno.h>
  130.26  
  130.27  /* File state for mmap()s on /proc/bus/pci/X/Y */
  130.28  enum pci_mmap_state {
   131.1 --- a/xen/include/xeno/reboot.h	Wed Mar 10 14:41:38 2004 +0000
   131.2 +++ b/xen/include/xeno/reboot.h	Wed Mar 10 16:07:13 2004 +0000
   131.3 @@ -32,7 +32,7 @@
   131.4  
   131.5  #ifdef __KERNEL__
   131.6  
   131.7 -#include <linux/notifier.h>
   131.8 +#include <xeno/notifier.h>
   131.9  
  131.10  extern int register_reboot_notifier(struct notifier_block *);
  131.11  extern int unregister_reboot_notifier(struct notifier_block *);
   132.1 --- a/xen/include/xeno/skbuff.h	Wed Mar 10 14:41:38 2004 +0000
   132.2 +++ b/xen/include/xeno/skbuff.h	Wed Mar 10 16:07:13 2004 +0000
   132.3 @@ -14,16 +14,16 @@
   132.4  #ifndef _LINUX_SKBUFF_H
   132.5  #define _LINUX_SKBUFF_H
   132.6  
   132.7 -#include <linux/config.h>
   132.8 -#include <linux/lib.h>
   132.9 -#include <linux/time.h>
  132.10 -#include <linux/timer.h>
  132.11 -#include <linux/cache.h>
  132.12 -#include <linux/slab.h>
  132.13 +#include <xeno/config.h>
  132.14 +#include <xeno/lib.h>
  132.15 +#include <xeno/time.h>
  132.16 +#include <xeno/timer.h>
  132.17 +#include <xeno/cache.h>
  132.18 +#include <xeno/slab.h>
  132.19  #include <asm/system.h>
  132.20  #include <asm/atomic.h>
  132.21  #include <asm/types.h>
  132.22 -#include <linux/mm.h>
  132.23 +#include <xeno/mm.h>
  132.24  #include <xeno/vif.h>
  132.25  
  132.26  /* skb_type values */
   133.1 --- a/xen/include/xeno/socket.h	Wed Mar 10 14:41:38 2004 +0000
   133.2 +++ b/xen/include/xeno/socket.h	Wed Mar 10 16:07:13 2004 +0000
   133.3 @@ -4,9 +4,9 @@
   133.4  #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
   133.5  
   133.6  //#include <asm/socket.h>			/* arch-dependent defines	*/
   133.7 -#include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/
   133.8 -//#include <linux/uio.h>			/* iovec support		*/
   133.9 -#include <linux/types.h>		/* pid_t			*/
  133.10 +#include <xeno/sockios.h>		/* the SIOCxxx I/O controls	*/
  133.11 +//#include <xeno/uio.h>			/* iovec support		*/
  133.12 +#include <xeno/types.h>		/* pid_t			*/
  133.13  
  133.14  typedef unsigned short	sa_family_t;
  133.15  
   134.1 --- a/xen/include/xeno/spinlock.h	Wed Mar 10 14:41:38 2004 +0000
   134.2 +++ b/xen/include/xeno/spinlock.h	Wed Mar 10 16:07:13 2004 +0000
   134.3 @@ -93,7 +93,7 @@ typedef struct {
   134.4  } spinlock_t;
   134.5  #define SPIN_LOCK_UNLOCKED (spinlock_t) { 0, 25, __BASE_FILE__ }
   134.6  
   134.7 -/*#include <linux/kernel.h>*/
   134.8 +/*#include <xeno/kernel.h>*/
   134.9  
  134.10  #define spin_lock_init(x)	do { (x)->lock = 0; } while (0)
  134.11  #define spin_is_locked(lock)	(test_bit(0,(lock)))
   135.1 --- a/xen/include/xeno/string.h	Wed Mar 10 14:41:38 2004 +0000
   135.2 +++ b/xen/include/xeno/string.h	Wed Mar 10 16:07:13 2004 +0000
   135.3 @@ -5,8 +5,8 @@
   135.4  
   135.5  #ifdef __KERNEL__
   135.6  
   135.7 -#include <linux/types.h>	/* for size_t */
   135.8 -//#include <linux/stddef.h>	/* for NULL */
   135.9 +#include <xeno/types.h>	/* for size_t */
  135.10 +//#include <xeno/stddef.h>	/* for NULL */
  135.11  
  135.12  #ifdef __cplusplus
  135.13  extern "C" {
   136.1 --- a/xen/include/xeno/timer.h	Wed Mar 10 14:41:38 2004 +0000
   136.2 +++ b/xen/include/xeno/timer.h	Wed Mar 10 16:07:13 2004 +0000
   136.3 @@ -1,8 +1,8 @@
   136.4  #ifndef _LINUX_TIMER_H
   136.5  #define _LINUX_TIMER_H
   136.6  
   136.7 -#include <linux/config.h>
   136.8 -#include <linux/list.h>
   136.9 +#include <xeno/config.h>
  136.10 +#include <xeno/list.h>
  136.11  
  136.12  /*
  136.13   * In Linux 2.4, static timers have been removed from the kernel.
   137.1 --- a/xen/include/xeno/tqueue.h	Wed Mar 10 14:41:38 2004 +0000
   137.2 +++ b/xen/include/xeno/tqueue.h	Wed Mar 10 16:07:13 2004 +0000
   137.3 @@ -13,8 +13,8 @@
   137.4  #ifndef _LINUX_TQUEUE_H
   137.5  #define _LINUX_TQUEUE_H
   137.6  
   137.7 -#include <linux/spinlock.h>
   137.8 -#include <linux/list.h>
   137.9 +#include <xeno/spinlock.h>
  137.10 +#include <xeno/list.h>
  137.11  #include <asm/bitops.h>
  137.12  #include <asm/system.h>
  137.13  
   138.1 --- a/xen/include/xeno/trace.h	Wed Mar 10 14:41:38 2004 +0000
   138.2 +++ b/xen/include/xeno/trace.h	Wed Mar 10 16:07:13 2004 +0000
   138.3 @@ -21,32 +21,7 @@
   138.4  #ifndef __XENO_TRACE_H__
   138.5  #define __XENO_TRACE_H__
   138.6  
   138.7 -/* This structure represents a single trace buffer record. */
   138.8 -struct t_rec {
   138.9 -    u64 cycles;               /* 64 bit cycle counter timestamp */
  138.10 -    u32 event;                /* 32 bit event ID                */
  138.11 -    u32 d1, d2, d3, d4, d5;   /* event data items               */
  138.12 -};
  138.13 -
  138.14 -/*
  138.15 - * This structure contains the metadata for a single trace buffer.  The head
  138.16 - * field, indexes into an array of struct t_rec's.
  138.17 - */
  138.18 -struct t_buf {
  138.19 -    struct t_rec *data;     /* pointer to data area.  physical address
  138.20 -                             * for convenience in user space code            */
  138.21 -
  138.22 -    unsigned int size;      /* size of the data area, in t_recs              */
  138.23 -    unsigned int head;      /* array index of the most recent record         */
  138.24 -
  138.25 -#ifdef __KERNEL__
  138.26 -    struct t_rec *head_ptr; /* pointer to the head record                    */
  138.27 -    struct t_rec *vdata;    /* virtual address pointer to data               */
  138.28 -    spinlock_t lock;        /* ensure mutually exlusive access (for inserts) */
  138.29 -#endif
  138.30 -
  138.31 -    /* never add anything here - the kernel stuff must be the last elements */
  138.32 -};
  138.33 +#include <hypervisor-ifs/trace.h>
  138.34  
  138.35  #ifdef TRACE_BUFFER
  138.36  
   139.1 --- a/xen/net/dev.c	Wed Mar 10 14:41:38 2004 +0000
   139.2 +++ b/xen/net/dev.c	Wed Mar 10 16:07:13 2004 +0000
   139.3 @@ -10,24 +10,24 @@
   139.4  #include <asm/uaccess.h>
   139.5  #include <asm/system.h>
   139.6  #include <asm/bitops.h>
   139.7 -#include <linux/config.h>
   139.8 -#include <linux/delay.h>
   139.9 -#include <linux/lib.h>
  139.10 -#include <linux/types.h>
  139.11 -#include <linux/sched.h>
  139.12 -#include <linux/mm.h>
  139.13 -#include <linux/socket.h>
  139.14 -#include <linux/sockios.h>
  139.15 -#include <linux/errno.h>
  139.16 -#include <linux/interrupt.h>
  139.17 -#include <linux/if_ether.h>
  139.18 -#include <linux/netdevice.h>
  139.19 -#include <linux/etherdevice.h>
  139.20 -#include <linux/skbuff.h>
  139.21 -#include <linux/brlock.h>
  139.22 -#include <linux/init.h>
  139.23 -#include <linux/module.h>
  139.24 -#include <linux/event.h>
  139.25 +#include <xeno/config.h>
  139.26 +#include <xeno/delay.h>
  139.27 +#include <xeno/lib.h>
  139.28 +#include <xeno/types.h>
  139.29 +#include <xeno/sched.h>
  139.30 +#include <xeno/mm.h>
  139.31 +#include <xeno/socket.h>
  139.32 +#include <xeno/sockios.h>
  139.33 +#include <xeno/errno.h>
  139.34 +#include <xeno/interrupt.h>
  139.35 +#include <xeno/if_ether.h>
  139.36 +#include <xeno/netdevice.h>
  139.37 +#include <xeno/etherdevice.h>
  139.38 +#include <xeno/skbuff.h>
  139.39 +#include <xeno/brlock.h>
  139.40 +#include <xeno/init.h>
  139.41 +#include <xeno/module.h>
  139.42 +#include <xeno/event.h>
  139.43  #include <asm/domain_page.h>
  139.44  #include <asm/pgalloc.h>
  139.45  #include <asm/io.h>
   140.1 --- a/xen/net/dev_mcast.c	Wed Mar 10 14:41:38 2004 +0000
   140.2 +++ b/xen/net/dev_mcast.c	Wed Mar 10 16:07:13 2004 +0000
   140.3 @@ -21,30 +21,30 @@
   140.4   *	2 of the License, or (at your option) any later version.
   140.5   */
   140.6  
   140.7 -#include <linux/config.h> 
   140.8 -#include <linux/lib.h> 
   140.9 +#include <xeno/config.h> 
  140.10 +#include <xeno/lib.h> 
  140.11  #include <asm/uaccess.h>
  140.12  #include <asm/system.h>
  140.13  #include <asm/bitops.h>
  140.14 -#include <linux/types.h>
  140.15 -//#include <linux/kernel.h>
  140.16 -#include <linux/sched.h>
  140.17 -//#include <linux/string.h>
  140.18 -#include <linux/mm.h>
  140.19 -#include <linux/socket.h>
  140.20 -#include <linux/sockios.h>
  140.21 -//#include <linux/in.h>
  140.22 -#include <linux/errno.h>
  140.23 -#include <linux/interrupt.h>
  140.24 -#include <linux/if_ether.h>
  140.25 -//#include <linux/inet.h>
  140.26 -#include <linux/netdevice.h>
  140.27 -#include <linux/etherdevice.h>
  140.28 -//#include <linux/proc_fs.h>
  140.29 -#include <linux/init.h>
  140.30 +#include <xeno/types.h>
  140.31 +//#include <xeno/kernel.h>
  140.32 +#include <xeno/sched.h>
  140.33 +//#include <xeno/string.h>
  140.34 +#include <xeno/mm.h>
  140.35 +#include <xeno/socket.h>
  140.36 +#include <xeno/sockios.h>
  140.37 +//#include <xeno/in.h>
  140.38 +#include <xeno/errno.h>
  140.39 +#include <xeno/interrupt.h>
  140.40 +#include <xeno/if_ether.h>
  140.41 +//#include <xeno/inet.h>
  140.42 +#include <xeno/netdevice.h>
  140.43 +#include <xeno/etherdevice.h>
  140.44 +//#include <xeno/proc_fs.h>
  140.45 +#include <xeno/init.h>
  140.46  //#include <net/ip.h>
  140.47  //#include <net/route.h>
  140.48 -#include <linux/skbuff.h>
  140.49 +#include <xeno/skbuff.h>
  140.50  //#include <net/sock.h>
  140.51  //#include <net/arp.h>
  140.52  
   141.1 --- a/xen/net/devinit.c	Wed Mar 10 14:41:38 2004 +0000
   141.2 +++ b/xen/net/devinit.c	Wed Mar 10 16:07:13 2004 +0000
   141.3 @@ -20,18 +20,18 @@
   141.4  #include <asm/uaccess.h>
   141.5  #include <asm/system.h>
   141.6  #include <asm/bitops.h>
   141.7 -#include <linux/config.h>
   141.8 -#include <linux/types.h>
   141.9 -#include <linux/sched.h>
  141.10 -#include <linux/lib.h>
  141.11 -#include <linux/mm.h>
  141.12 -#include <linux/socket.h>
  141.13 -#include <linux/sockios.h>
  141.14 -#include <linux/errno.h>
  141.15 -#include <linux/interrupt.h>
  141.16 -#include <linux/netdevice.h>
  141.17 -#include <linux/skbuff.h>
  141.18 -#include <linux/init.h>
  141.19 +#include <xeno/config.h>
  141.20 +#include <xeno/types.h>
  141.21 +#include <xeno/sched.h>
  141.22 +#include <xeno/lib.h>
  141.23 +#include <xeno/mm.h>
  141.24 +#include <xeno/socket.h>
  141.25 +#include <xeno/sockios.h>
  141.26 +#include <xeno/errno.h>
  141.27 +#include <xeno/interrupt.h>
  141.28 +#include <xeno/netdevice.h>
  141.29 +#include <xeno/skbuff.h>
  141.30 +#include <xeno/init.h>
  141.31  
  141.32  static void dev_watchdog(unsigned long arg)
  141.33  {
   142.1 --- a/xen/net/eth.c	Wed Mar 10 14:41:38 2004 +0000
   142.2 +++ b/xen/net/eth.c	Wed Mar 10 16:07:13 2004 +0000
   142.3 @@ -37,22 +37,22 @@
   142.4   *		as published by the Free Software Foundation; either version
   142.5   *		2 of the License, or (at your option) any later version.
   142.6   */
   142.7 -#include <linux/types.h>
   142.8 -//#include <linux/kernel.h>
   142.9 -#include <linux/sched.h>
  142.10 -//#include <linux/string.h>
  142.11 -#include <linux/mm.h>
  142.12 -#include <linux/socket.h>
  142.13 -//#include <linux/in.h>
  142.14 -//#include <linux/inet.h>
  142.15 -//#include <linux/ip.h>
  142.16 -#include <linux/netdevice.h>
  142.17 -#include <linux/etherdevice.h>
  142.18 -#include <linux/skbuff.h>
  142.19 -#include <linux/errno.h>
  142.20 -#include <linux/config.h>
  142.21 -#include <linux/lib.h>
  142.22 -#include <linux/init.h>
  142.23 +#include <xeno/types.h>
  142.24 +//#include <xeno/kernel.h>
  142.25 +#include <xeno/sched.h>
  142.26 +//#include <xeno/string.h>
  142.27 +#include <xeno/mm.h>
  142.28 +#include <xeno/socket.h>
  142.29 +//#include <xeno/in.h>
  142.30 +//#include <xeno/inet.h>
  142.31 +//#include <xeno/ip.h>
  142.32 +#include <xeno/netdevice.h>
  142.33 +#include <xeno/etherdevice.h>
  142.34 +#include <xeno/skbuff.h>
  142.35 +#include <xeno/errno.h>
  142.36 +#include <xeno/config.h>
  142.37 +#include <xeno/lib.h>
  142.38 +#include <xeno/init.h>
  142.39  //#include <net/dst.h>
  142.40  //#include <net/arp.h>
  142.41  //#include <net/sock.h>
   143.1 --- a/xen/net/skbuff.c	Wed Mar 10 14:41:38 2004 +0000
   143.2 +++ b/xen/net/skbuff.c	Wed Mar 10 16:07:13 2004 +0000
   143.3 @@ -32,18 +32,18 @@
   143.4   *	2 of the License, or (at your option) any later version.
   143.5   */
   143.6  
   143.7 -#include <linux/config.h>
   143.8 -#include <linux/lib.h>
   143.9 -#include <linux/errno.h>
  143.10 -#include <linux/types.h>
  143.11 -#include <linux/sched.h>
  143.12 -#include <linux/mm.h>
  143.13 -#include <linux/interrupt.h>
  143.14 -#include <linux/slab.h>
  143.15 -#include <linux/netdevice.h>
  143.16 -#include <linux/skbuff.h>
  143.17 -#include <linux/cache.h>
  143.18 -#include <linux/init.h>
  143.19 +#include <xeno/config.h>
  143.20 +#include <xeno/lib.h>
  143.21 +#include <xeno/errno.h>
  143.22 +#include <xeno/types.h>
  143.23 +#include <xeno/sched.h>
  143.24 +#include <xeno/mm.h>
  143.25 +#include <xeno/interrupt.h>
  143.26 +#include <xeno/slab.h>
  143.27 +#include <xeno/netdevice.h>
  143.28 +#include <xeno/skbuff.h>
  143.29 +#include <xeno/cache.h>
  143.30 +#include <xeno/init.h>
  143.31  
  143.32  #include <asm/uaccess.h>
  143.33  #include <asm/system.h>