ia64/xen-unstable

changeset 1210:9f85adafc1e1

bitkeeper revision 1.821 (406007d6uu0vZYDxa9P1ZfNO9kF_Cg)

Many files:
xeno -> xen renames.
ide-xen.c:
Rename: xen/drivers/ide/ide-xeno.c -> xen/drivers/ide/ide-xen.c
xen.lds:
Rename: xen/arch/i386/xeno.lds -> xen/arch/i386/xen.lds
Many files:
mvdir
author kaf24@scramble.cl.cam.ac.uk
date Tue Mar 23 09:48:06 2004 +0000 (2004-03-23)
parents 1955d4f31629
children a235ded07b12
files .rootkeys BitKeeper/etc/ignore xen/Makefile xen/Rules.mk xen/arch/i386/Rules.mk xen/arch/i386/acpitable.c xen/arch/i386/apic.c xen/arch/i386/boot/boot.S xen/arch/i386/delay.c xen/arch/i386/domain_page.c xen/arch/i386/entry.S xen/arch/i386/extable.c xen/arch/i386/flushtlb.c xen/arch/i386/i387.c xen/arch/i386/i8259.c xen/arch/i386/idle0_task.c xen/arch/i386/io_apic.c xen/arch/i386/ioremap.c xen/arch/i386/irq.c xen/arch/i386/mm.c xen/arch/i386/mpparse.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/pdb-stub.c xen/arch/i386/process.c xen/arch/i386/setup.c xen/arch/i386/smp.c xen/arch/i386/smpboot.c xen/arch/i386/time.c xen/arch/i386/trampoline.S xen/arch/i386/traps.c xen/arch/i386/usercopy.c xen/arch/i386/xen.lds xen/arch/i386/xeno.lds xen/arch/x86_64/Rules.mk xen/common/ac_timer.c xen/common/brlock.c xen/common/debug-linux.c xen/common/debug.c xen/common/dom0_ops.c xen/common/dom_mem_ops.c xen/common/domain.c xen/common/event.c xen/common/event_channel.c xen/common/kernel.c xen/common/keyhandler.c xen/common/lib.c xen/common/memory.c xen/common/network.c xen/common/page_alloc.c xen/common/perfc.c xen/common/physdev.c xen/common/rbtree.c xen/common/resource.c xen/common/sched_bvt.c xen/common/sched_rrobin.c xen/common/schedule.c xen/common/slab.c xen/common/softirq.c xen/common/string.c xen/common/timer.c xen/common/trace.c xen/common/vsprintf.c xen/drivers/block/blkpg.c xen/drivers/block/cciss.c xen/drivers/block/cciss.h xen/drivers/block/cciss_scsi.c xen/drivers/block/elevator.c xen/drivers/block/genhd.c xen/drivers/block/ll_rw_blk.c xen/drivers/block/xen_block.c xen/drivers/block/xen_vbd.c xen/drivers/cdrom/cdrom.c xen/drivers/char/console.c xen/drivers/char/keyboard.c xen/drivers/char/serial.c xen/drivers/ide/ide-cd.c xen/drivers/ide/ide-cd.h xen/drivers/ide/ide-disk.c xen/drivers/ide/ide-dma.c xen/drivers/ide/ide-features.c xen/drivers/ide/ide-geometry.c xen/drivers/ide/ide-pci.c xen/drivers/ide/ide-probe.c xen/drivers/ide/ide-taskfile.c xen/drivers/ide/ide-xen.c xen/drivers/ide/ide-xeno.c xen/drivers/ide/ide.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.c xen/drivers/message/fusion/mptbase.h xen/drivers/message/fusion/mptscsih.c 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/dummy.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/aacraid.h 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/aic7xxx/aic79xx_osm.c xen/drivers/scsi/aic7xxx/aic79xx_osm.h xen/drivers/scsi/aic7xxx/aic7xxx_osm.c xen/drivers/scsi/aic7xxx/aic7xxx_osm.h xen/drivers/scsi/constants.c xen/drivers/scsi/hosts.c xen/drivers/scsi/hosts.h xen/drivers/scsi/megaraid.c xen/drivers/scsi/megaraid.h xen/drivers/scsi/scsi.c xen/drivers/scsi/scsi.h xen/drivers/scsi/scsi_dma.c xen/drivers/scsi/scsi_error.c xen/drivers/scsi/scsi_ioctl.c xen/drivers/scsi/scsi_lib.c xen/drivers/scsi/scsi_merge.c xen/drivers/scsi/scsi_module.c.inc xen/drivers/scsi/scsi_obsolete.c xen/drivers/scsi/scsi_proc.c xen/drivers/scsi/scsi_queue.c xen/drivers/scsi/scsi_scan.c xen/drivers/scsi/scsi_syms.c xen/drivers/scsi/scsicam.c xen/drivers/scsi/sd.c xen/drivers/scsi/sd.h xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h xen/drivers/scsi/sym53c8xx_2/sym_glue.c xen/drivers/scsi/sym53c8xx_2/sym_glue.h xen/include/asm-i386/apic.h xen/include/asm-i386/atomic.h xen/include/asm-i386/bitops.h xen/include/asm-i386/byteorder.h xen/include/asm-i386/cache.h xen/include/asm-i386/dma.h xen/include/asm-i386/domain_page.h xen/include/asm-i386/fixmap.h xen/include/asm-i386/flushtlb.h xen/include/asm-i386/hardirq.h xen/include/asm-i386/i387.h xen/include/asm-i386/ide.h xen/include/asm-i386/io.h xen/include/asm-i386/io_apic.h xen/include/asm-i386/irq.h xen/include/asm-i386/mc146818rtc.h xen/include/asm-i386/page.h xen/include/asm-i386/pci.h xen/include/asm-i386/pdb.h xen/include/asm-i386/pgalloc.h xen/include/asm-i386/processor.h xen/include/asm-i386/smp.h xen/include/asm-i386/spinlock.h xen/include/asm-i386/string.h xen/include/asm-i386/system.h xen/include/asm-i386/timex.h xen/include/asm-i386/types.h xen/include/asm-i386/uaccess.h xen/include/asm-x86_64/apic.h xen/include/asm-x86_64/atomic.h xen/include/asm-x86_64/bitops.h xen/include/asm-x86_64/byteorder.h xen/include/asm-x86_64/cache.h xen/include/asm-x86_64/dma.h xen/include/asm-x86_64/domain_page.h xen/include/asm-x86_64/fixmap.h xen/include/asm-x86_64/flushtlb.h xen/include/asm-x86_64/hardirq.h xen/include/asm-x86_64/i387.h xen/include/asm-x86_64/ide.h xen/include/asm-x86_64/io.h xen/include/asm-x86_64/io_apic.h xen/include/asm-x86_64/irq.h xen/include/asm-x86_64/mc146818rtc.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/pdb.h xen/include/asm-x86_64/pgalloc.h xen/include/asm-x86_64/processor.h xen/include/asm-x86_64/smp.h xen/include/asm-x86_64/spinlock.h xen/include/asm-x86_64/system.h xen/include/asm-x86_64/timex.h xen/include/asm-x86_64/types.h xen/include/asm-x86_64/uaccess.h xen/include/hypervisor-ifs/hypervisor-if.h xen/include/scsi/scsicam.h xen/include/xen/ac_timer.h xen/include/xen/blk.h xen/include/xen/blkdev.h xen/include/xen/blkpg.h xen/include/xen/brlock.h xen/include/xen/byteorder/big_endian.h xen/include/xen/byteorder/generic.h xen/include/xen/byteorder/little_endian.h xen/include/xen/byteorder/pdp_endian.h xen/include/xen/byteorder/swab.h xen/include/xen/byteorder/swabb.h xen/include/xen/cache.h xen/include/xen/cdrom.h xen/include/xen/compiler.h xen/include/xen/config.h xen/include/xen/console.h xen/include/xen/crc32.h xen/include/xen/ctype.h xen/include/xen/delay.h xen/include/xen/elevator.h xen/include/xen/errno.h xen/include/xen/etherdevice.h xen/include/xen/ethtool.h xen/include/xen/event.h xen/include/xen/genhd.h xen/include/xen/hdreg.h xen/include/xen/hdsmart.h xen/include/xen/ide.h xen/include/xen/if.h xen/include/xen/if_ether.h xen/include/xen/if_packet.h xen/include/xen/if_vlan.h xen/include/xen/in.h xen/include/xen/init.h xen/include/xen/interrupt.h xen/include/xen/ioctl.h xen/include/xen/ioport.h xen/include/xen/irq.h xen/include/xen/irq_cpustat.h xen/include/xen/kdev_t.h xen/include/xen/kernel.h xen/include/xen/keyhandler.h xen/include/xen/lib.h xen/include/xen/list.h xen/include/xen/major.h xen/include/xen/mii.h xen/include/xen/mm.h xen/include/xen/module.h xen/include/xen/multiboot.h xen/include/xen/net_headers.h xen/include/xen/netdevice.h xen/include/xen/notifier.h xen/include/xen/pci.h xen/include/xen/pci_ids.h xen/include/xen/perfc.h xen/include/xen/perfc_defn.h xen/include/xen/prefetch.h xen/include/xen/rbtree.h xen/include/xen/reboot.h xen/include/xen/sched-if.h xen/include/xen/sched.h xen/include/xen/serial.h xen/include/xen/skbuff.h xen/include/xen/slab.h xen/include/xen/smp.h xen/include/xen/socket.h xen/include/xen/sockios.h xen/include/xen/spinlock.h xen/include/xen/string.h xen/include/xen/time.h xen/include/xen/timer.h xen/include/xen/timex.h xen/include/xen/tqueue.h xen/include/xen/trace.h xen/include/xen/types.h xen/include/xen/vbd.h xen/include/xen/version.h xen/include/xen/vif.h xen/include/xeno/ac_timer.h xen/include/xeno/blk.h xen/include/xeno/blkdev.h xen/include/xeno/blkpg.h xen/include/xeno/brlock.h xen/include/xeno/byteorder/big_endian.h xen/include/xeno/byteorder/generic.h xen/include/xeno/byteorder/little_endian.h xen/include/xeno/byteorder/pdp_endian.h xen/include/xeno/byteorder/swab.h xen/include/xeno/byteorder/swabb.h xen/include/xeno/cache.h xen/include/xeno/cdrom.h xen/include/xeno/compiler.h xen/include/xeno/config.h xen/include/xeno/console.h xen/include/xeno/crc32.h xen/include/xeno/ctype.h xen/include/xeno/delay.h xen/include/xeno/elevator.h xen/include/xeno/errno.h xen/include/xeno/etherdevice.h xen/include/xeno/ethtool.h xen/include/xeno/event.h xen/include/xeno/genhd.h xen/include/xeno/hdreg.h xen/include/xeno/hdsmart.h xen/include/xeno/ide.h xen/include/xeno/if.h xen/include/xeno/if_ether.h xen/include/xeno/if_packet.h xen/include/xeno/if_vlan.h xen/include/xeno/in.h xen/include/xeno/init.h xen/include/xeno/interrupt.h xen/include/xeno/ioctl.h xen/include/xeno/ioport.h xen/include/xeno/irq.h xen/include/xeno/irq_cpustat.h xen/include/xeno/kdev_t.h xen/include/xeno/kernel.h xen/include/xeno/keyhandler.h xen/include/xeno/lib.h xen/include/xeno/list.h xen/include/xeno/major.h xen/include/xeno/mii.h xen/include/xeno/mm.h xen/include/xeno/module.h xen/include/xeno/multiboot.h xen/include/xeno/net_headers.h xen/include/xeno/netdevice.h xen/include/xeno/notifier.h xen/include/xeno/pci.h xen/include/xeno/pci_ids.h xen/include/xeno/perfc.h xen/include/xeno/perfc_defn.h xen/include/xeno/prefetch.h xen/include/xeno/rbtree.h xen/include/xeno/reboot.h xen/include/xeno/sched-if.h xen/include/xeno/sched.h xen/include/xeno/serial.h xen/include/xeno/skbuff.h xen/include/xeno/slab.h xen/include/xeno/smp.h xen/include/xeno/socket.h xen/include/xeno/sockios.h xen/include/xeno/spinlock.h xen/include/xeno/string.h xen/include/xeno/time.h xen/include/xeno/timer.h xen/include/xeno/timex.h xen/include/xeno/tqueue.h xen/include/xeno/trace.h xen/include/xeno/types.h xen/include/xeno/vbd.h xen/include/xeno/version.h xen/include/xeno/vif.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	Tue Mar 23 09:33:07 2004 +0000
     1.2 +++ b/.rootkeys	Tue Mar 23 09:48:06 2004 +0000
     1.3 @@ -153,7 +153,7 @@ 3ddb79bc-Udq7ol-NX4q9XsYnN7A2Q xen/arch/
     1.4  3ddb79bccYVzXZJyVaxuv5T42Z1Fsw xen/arch/i386/trampoline.S
     1.5  3ddb79bcOftONV9h4QCxXOfiT0h91w xen/arch/i386/traps.c
     1.6  3ddb79bc4nTpGQOe6_-MbyZzkhlhFQ xen/arch/i386/usercopy.c
     1.7 -3ddb79bcOMCu9-5mKpjIh5d0qqBDPg xen/arch/i386/xeno.lds
     1.8 +3ddb79bcOMCu9-5mKpjIh5d0qqBDPg xen/arch/i386/xen.lds
     1.9  404f1b91uzXgPOtIhs8UZPGbZvlHfg xen/arch/x86_64/Rules.mk
    1.10  3ddb79bdff-gj-jFGKjOejeHLqL8Lg xen/common/Makefile
    1.11  3e397e66AyyD5fYraAySWuwi9uqSXg xen/common/ac_timer.c
    1.12 @@ -213,7 +213,7 @@ 3ddb79bdh1ohsWYRH_KdaXr7cqs12w xen/drive
    1.13  3ddb79bdYcxXT-2UEaDcG0Ic4MIK1g xen/drivers/ide/ide-pci.c
    1.14  3ddb79bdOXTbcImJo8DwmlNX88k78Q xen/drivers/ide/ide-probe.c
    1.15  3ddb79bdDWFwINnKn29RlFDwGJhjYg xen/drivers/ide/ide-taskfile.c
    1.16 -3e4a8d40XMqvT05EwZwJg1HMsFDUBA xen/drivers/ide/ide-xeno.c
    1.17 +3e4a8d40XMqvT05EwZwJg1HMsFDUBA xen/drivers/ide/ide-xen.c
    1.18  3ddb79bdkDY1bSOYkToP1Cc49VdBxg xen/drivers/ide/ide.c
    1.19  3ddb79bdPyAvT_WZTAFhaX0jp-yXSw xen/drivers/ide/ide_modes.h
    1.20  3e4a8d401aSwOzCScQXR3lsmNlAwUQ xen/drivers/ide/piix.c
    1.21 @@ -512,84 +512,84 @@ 3ddb79c4qbCoOFHrv9sCGshbWzBVlQ xen/inclu
    1.22  3ddb79c4R4iVwqIIeychVQYmIH4FUg xen/include/scsi/scsi_ioctl.h
    1.23  3ddb79c4yw_mfd4Uikn3v_IOPRpa1Q xen/include/scsi/scsicam.h
    1.24  3ddb79c4HKPMLvDBP9LxzPi_szVxGA xen/include/scsi/sg.h
    1.25 -3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xeno/ac_timer.h
    1.26 -3ddb79c0nTsjSpVK4ZVTI9WwN24xtQ xen/include/xeno/blk.h
    1.27 -3ddb79c0dVhTHLsv6CPTf4baKix4mA xen/include/xeno/blkdev.h
    1.28 -3ddb79c18ePBgitnOs7GiOCFilODVw xen/include/xeno/blkpg.h
    1.29 -3ddb79c1oOjpQbp68MW7yiUpoi-S-w xen/include/xeno/brlock.h
    1.30 -3ddb79c1x7Ie3kifu7dQRx8y7HVyvA xen/include/xeno/byteorder/big_endian.h
    1.31 -3ddb79c1qFXOEX1eD0yXJ_gsGkUt8w xen/include/xeno/byteorder/generic.h
    1.32 -3ddb79c1VbwFALNpgx6uC_iZKFHD-A xen/include/xeno/byteorder/little_endian.h
    1.33 -3ddb79c1VvNRMM35bpdZMekirCXP-A xen/include/xeno/byteorder/pdp_endian.h
    1.34 -3ddb79c116WbJV8bwGZXFFJy_GNNvw xen/include/xeno/byteorder/swab.h
    1.35 -3ddb79c1pwmlw8VXW8aaSKAVGVmjDA xen/include/xeno/byteorder/swabb.h
    1.36 -3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xeno/cache.h
    1.37 -3e9c248aEG_nCngztiFmv5CfayNkcA xen/include/xeno/cdrom.h
    1.38 -3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xeno/compiler.h
    1.39 -3ddb79c259jh8hE7vre_8NuE7nwNSA xen/include/xeno/config.h
    1.40 -3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xeno/console.h
    1.41 -3f0c428eIwGr7n9fj4FkBdX2YvA_Rw xen/include/xeno/crc32.h
    1.42 -3ddb79c1V44RD26YqCUm-kqIupM37A xen/include/xeno/ctype.h
    1.43 -3ddb79c05DdHQ0UxX_jKsXdR4QlMCA xen/include/xeno/delay.h
    1.44 -3ddb79c1uaWQZj551j1O0B5z8AnHOg xen/include/xeno/elevator.h
    1.45 -3ddb79c0HIghfBF8zFUdmXhOU8i6hA xen/include/xeno/errno.h
    1.46 -3ddb79c0rMjudDKkJku_mkm0J-BZgw xen/include/xeno/etherdevice.h
    1.47 -3ddb79c0T3X07lFnM9OSE-W5bqIDSQ xen/include/xeno/ethtool.h
    1.48 -3ddb79c1W0lQca8gRV7sN6j3iY4Luw xen/include/xeno/event.h
    1.49 -3ddb79c1J4I_AjNflZL-1c1jOIlSyg xen/include/xeno/genhd.h
    1.50 -3ddb79c1i-chIoeniqgYwMM3EgaR5w xen/include/xeno/hdreg.h
    1.51 -3ddb79c12GuUuaxBKiMuwf-Qvuwpng xen/include/xeno/hdsmart.h
    1.52 -3ddb79c0MM575N4YvMSiw9EqKH4JDA xen/include/xeno/ide.h
    1.53 -3ddb79c1yHLp08JhgPxIMcZ8DwN9hg xen/include/xeno/if.h
    1.54 -3ddb79c1RCWOkWPQRzbYVTX_e-E7CA xen/include/xeno/if_ether.h
    1.55 -3ddb79c2IYah7z7hkzPyOiG8szKkyw xen/include/xeno/if_packet.h
    1.56 -3e4540ccefnCkeqtD_dW_CBOjXUSYw xen/include/xeno/if_vlan.h
    1.57 -3df0af1c-QrOEqpPHq4uL3NZzCeJCg xen/include/xeno/in.h
    1.58 -3ddb79c0GurNF9tDWqQbAwJFH8ugfA xen/include/xeno/init.h
    1.59 -3ddb79c1Vi5VleJAOKHAlY0G2zAsgw xen/include/xeno/interrupt.h
    1.60 -3ddb79c2J6EnruiygRhBCgftzMzTeQ xen/include/xeno/ioctl.h
    1.61 -3ddb79c1nzaWu8NoF4xCCMSFJR4MlA xen/include/xeno/ioport.h
    1.62 -3ddb79c2qAxCOABlkKtD8Txohe-qEw xen/include/xeno/irq.h
    1.63 -3ddb79c2b3qe-6Ann09FqZBF4IrJaQ xen/include/xeno/irq_cpustat.h
    1.64 -3ddb79c11w_O7z7YZJnzuDSxaK5LlA xen/include/xeno/kdev_t.h
    1.65 -3e4540ccPHqIIv2pvnQ1gV8LUnoHIg xen/include/xeno/kernel.h
    1.66 -3e4cd9d8elj_7EgAs9Of56RQ2Yq_4g xen/include/xeno/keyhandler.h
    1.67 -3ddb79c1NfYlOrWNqgZkj9EwtFfJow xen/include/xeno/lib.h
    1.68 -3ddb79c18Ajy7micDGQQfJ0zWgEHtA xen/include/xeno/list.h
    1.69 -3ddb79c0_s2_wgV0cA6tztEaeyy1NA xen/include/xeno/major.h
    1.70 -3ddb79c1fsWuKI2sGlW5bqoG2lPVNA xen/include/xeno/mii.h
    1.71 -3ddb79c1gs2VbLbQlw0dcDUXYIepDA xen/include/xeno/mm.h
    1.72 -3ddb79c13p9iHn1XAp0IS1qvj4yDsg xen/include/xeno/module.h
    1.73 -3ddb79c1ieLZfGSFwfvvSQ2NK1BMSg xen/include/xeno/multiboot.h
    1.74 -3ec92e46saEJq7v1vgEJD3HZSufSBg xen/include/xeno/net_headers.h
    1.75 -3ddb79c0CLfAlJLg1ohdPD-Jjn-jxg xen/include/xeno/netdevice.h
    1.76 -3e4540ccaugeWGdOuphJKj6WFw1jkw xen/include/xeno/notifier.h
    1.77 -3ddb79c2Fg44_PBPVxHSC0gTOMq4Ow xen/include/xeno/pci.h
    1.78 -3ddb79c0MOVXq8qZDQRGb6z64_xAwg xen/include/xeno/pci_ids.h
    1.79 -3e54c38dlSCVdyVM4PKcrSfzLLxWUQ xen/include/xeno/perfc.h
    1.80 -3e54c38de9SUSYSAwxDf_DwkpAnQFA xen/include/xeno/perfc_defn.h
    1.81 -3ddb79c04nQVR3EYM5L4zxDV_MCo1g xen/include/xeno/prefetch.h
    1.82 -4006e65fWMwLqcocgik6wbF0Eeh0Og xen/include/xeno/rbtree.h
    1.83 -3e4540ccU1sgCx8seIMGlahmMfv7yQ xen/include/xeno/reboot.h
    1.84 -40589969nPq3DMzv24RDb5LXE9brHw xen/include/xeno/sched-if.h
    1.85 -3ddb79c0LzqqS0LhAQ50ekgj4oGl7Q xen/include/xeno/sched.h
    1.86 -403a06a7H0hpHcKpAiDe5BPnaXWTlA xen/include/xeno/serial.h
    1.87 -3ddb79c0VDeD-Oft5eNfMneTU3D1dQ xen/include/xeno/skbuff.h
    1.88 -3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xeno/slab.h
    1.89 -3ddb79c09xbS-xxfKxuV3JETIhBzmg xen/include/xeno/smp.h
    1.90 -3ddb79c1-yIt89RT02wIPp2xDR8YjQ xen/include/xeno/socket.h
    1.91 -3ddb79c2V2P9F2xMCzDJ9vbUofSg_Q xen/include/xeno/sockios.h
    1.92 -3ddb79c2iIcESrDAB8samy_yAh6olQ xen/include/xeno/spinlock.h
    1.93 -3e7f358aMtFMUVvN_Zjg5qvEJIqEBA xen/include/xeno/string.h
    1.94 -3ddb79c0BnA20PbgmuMPSGIBljNRQw xen/include/xeno/time.h
    1.95 -3ddb79c2HFkXuRxi1CriJtSFmY6Ybw xen/include/xeno/timer.h
    1.96 -3ddb79c2_m8lT9jDKse_tePj7zcnNQ xen/include/xeno/timex.h
    1.97 -3ddb79c2e2C14HkndNEJlYwXaPrF5A xen/include/xeno/tqueue.h
    1.98 -403a3edbG9K5uZjuY19_LORbQGmFbA xen/include/xeno/trace.h
    1.99 -3ddb79c1-kVvF8cVa0k3ZHDdBMj01Q xen/include/xeno/types.h
   1.100 -3f055a3dwldYR102YcSuBaxIf9t3Jw xen/include/xeno/vbd.h
   1.101 -3e8827bdaqPeZAWGVOwswgY9bWSx4g xen/include/xeno/version.h
   1.102 -3ddb79c2Ae5KpzhC9LCYG7mP_Vi4Aw xen/include/xeno/vif.h
   1.103 +3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
   1.104 +3ddb79c0nTsjSpVK4ZVTI9WwN24xtQ xen/include/xen/blk.h
   1.105 +3ddb79c0dVhTHLsv6CPTf4baKix4mA xen/include/xen/blkdev.h
   1.106 +3ddb79c18ePBgitnOs7GiOCFilODVw xen/include/xen/blkpg.h
   1.107 +3ddb79c1oOjpQbp68MW7yiUpoi-S-w xen/include/xen/brlock.h
   1.108 +3ddb79c1x7Ie3kifu7dQRx8y7HVyvA xen/include/xen/byteorder/big_endian.h
   1.109 +3ddb79c1qFXOEX1eD0yXJ_gsGkUt8w xen/include/xen/byteorder/generic.h
   1.110 +3ddb79c1VbwFALNpgx6uC_iZKFHD-A xen/include/xen/byteorder/little_endian.h
   1.111 +3ddb79c1VvNRMM35bpdZMekirCXP-A xen/include/xen/byteorder/pdp_endian.h
   1.112 +3ddb79c116WbJV8bwGZXFFJy_GNNvw xen/include/xen/byteorder/swab.h
   1.113 +3ddb79c1pwmlw8VXW8aaSKAVGVmjDA xen/include/xen/byteorder/swabb.h
   1.114 +3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h
   1.115 +3e9c248aEG_nCngztiFmv5CfayNkcA xen/include/xen/cdrom.h
   1.116 +3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h
   1.117 +3ddb79c259jh8hE7vre_8NuE7nwNSA xen/include/xen/config.h
   1.118 +3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xen/console.h
   1.119 +3f0c428eIwGr7n9fj4FkBdX2YvA_Rw xen/include/xen/crc32.h
   1.120 +3ddb79c1V44RD26YqCUm-kqIupM37A xen/include/xen/ctype.h
   1.121 +3ddb79c05DdHQ0UxX_jKsXdR4QlMCA xen/include/xen/delay.h
   1.122 +3ddb79c1uaWQZj551j1O0B5z8AnHOg xen/include/xen/elevator.h
   1.123 +3ddb79c0HIghfBF8zFUdmXhOU8i6hA xen/include/xen/errno.h
   1.124 +3ddb79c0rMjudDKkJku_mkm0J-BZgw xen/include/xen/etherdevice.h
   1.125 +3ddb79c0T3X07lFnM9OSE-W5bqIDSQ xen/include/xen/ethtool.h
   1.126 +3ddb79c1W0lQca8gRV7sN6j3iY4Luw xen/include/xen/event.h
   1.127 +3ddb79c1J4I_AjNflZL-1c1jOIlSyg xen/include/xen/genhd.h
   1.128 +3ddb79c1i-chIoeniqgYwMM3EgaR5w xen/include/xen/hdreg.h
   1.129 +3ddb79c12GuUuaxBKiMuwf-Qvuwpng xen/include/xen/hdsmart.h
   1.130 +3ddb79c0MM575N4YvMSiw9EqKH4JDA xen/include/xen/ide.h
   1.131 +3ddb79c1yHLp08JhgPxIMcZ8DwN9hg xen/include/xen/if.h
   1.132 +3ddb79c1RCWOkWPQRzbYVTX_e-E7CA xen/include/xen/if_ether.h
   1.133 +3ddb79c2IYah7z7hkzPyOiG8szKkyw xen/include/xen/if_packet.h
   1.134 +3e4540ccefnCkeqtD_dW_CBOjXUSYw xen/include/xen/if_vlan.h
   1.135 +3df0af1c-QrOEqpPHq4uL3NZzCeJCg xen/include/xen/in.h
   1.136 +3ddb79c0GurNF9tDWqQbAwJFH8ugfA xen/include/xen/init.h
   1.137 +3ddb79c1Vi5VleJAOKHAlY0G2zAsgw xen/include/xen/interrupt.h
   1.138 +3ddb79c2J6EnruiygRhBCgftzMzTeQ xen/include/xen/ioctl.h
   1.139 +3ddb79c1nzaWu8NoF4xCCMSFJR4MlA xen/include/xen/ioport.h
   1.140 +3ddb79c2qAxCOABlkKtD8Txohe-qEw xen/include/xen/irq.h
   1.141 +3ddb79c2b3qe-6Ann09FqZBF4IrJaQ xen/include/xen/irq_cpustat.h
   1.142 +3ddb79c11w_O7z7YZJnzuDSxaK5LlA xen/include/xen/kdev_t.h
   1.143 +3e4540ccPHqIIv2pvnQ1gV8LUnoHIg xen/include/xen/kernel.h
   1.144 +3e4cd9d8elj_7EgAs9Of56RQ2Yq_4g xen/include/xen/keyhandler.h
   1.145 +3ddb79c1NfYlOrWNqgZkj9EwtFfJow xen/include/xen/lib.h
   1.146 +3ddb79c18Ajy7micDGQQfJ0zWgEHtA xen/include/xen/list.h
   1.147 +3ddb79c0_s2_wgV0cA6tztEaeyy1NA xen/include/xen/major.h
   1.148 +3ddb79c1fsWuKI2sGlW5bqoG2lPVNA xen/include/xen/mii.h
   1.149 +3ddb79c1gs2VbLbQlw0dcDUXYIepDA xen/include/xen/mm.h
   1.150 +3ddb79c13p9iHn1XAp0IS1qvj4yDsg xen/include/xen/module.h
   1.151 +3ddb79c1ieLZfGSFwfvvSQ2NK1BMSg xen/include/xen/multiboot.h
   1.152 +3ec92e46saEJq7v1vgEJD3HZSufSBg xen/include/xen/net_headers.h
   1.153 +3ddb79c0CLfAlJLg1ohdPD-Jjn-jxg xen/include/xen/netdevice.h
   1.154 +3e4540ccaugeWGdOuphJKj6WFw1jkw xen/include/xen/notifier.h
   1.155 +3ddb79c2Fg44_PBPVxHSC0gTOMq4Ow xen/include/xen/pci.h
   1.156 +3ddb79c0MOVXq8qZDQRGb6z64_xAwg xen/include/xen/pci_ids.h
   1.157 +3e54c38dlSCVdyVM4PKcrSfzLLxWUQ xen/include/xen/perfc.h
   1.158 +3e54c38de9SUSYSAwxDf_DwkpAnQFA xen/include/xen/perfc_defn.h
   1.159 +3ddb79c04nQVR3EYM5L4zxDV_MCo1g xen/include/xen/prefetch.h
   1.160 +4006e65fWMwLqcocgik6wbF0Eeh0Og xen/include/xen/rbtree.h
   1.161 +3e4540ccU1sgCx8seIMGlahmMfv7yQ xen/include/xen/reboot.h
   1.162 +40589969nPq3DMzv24RDb5LXE9brHw xen/include/xen/sched-if.h
   1.163 +3ddb79c0LzqqS0LhAQ50ekgj4oGl7Q xen/include/xen/sched.h
   1.164 +403a06a7H0hpHcKpAiDe5BPnaXWTlA xen/include/xen/serial.h
   1.165 +3ddb79c0VDeD-Oft5eNfMneTU3D1dQ xen/include/xen/skbuff.h
   1.166 +3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xen/slab.h
   1.167 +3ddb79c09xbS-xxfKxuV3JETIhBzmg xen/include/xen/smp.h
   1.168 +3ddb79c1-yIt89RT02wIPp2xDR8YjQ xen/include/xen/socket.h
   1.169 +3ddb79c2V2P9F2xMCzDJ9vbUofSg_Q xen/include/xen/sockios.h
   1.170 +3ddb79c2iIcESrDAB8samy_yAh6olQ xen/include/xen/spinlock.h
   1.171 +3e7f358aMtFMUVvN_Zjg5qvEJIqEBA xen/include/xen/string.h
   1.172 +3ddb79c0BnA20PbgmuMPSGIBljNRQw xen/include/xen/time.h
   1.173 +3ddb79c2HFkXuRxi1CriJtSFmY6Ybw xen/include/xen/timer.h
   1.174 +3ddb79c2_m8lT9jDKse_tePj7zcnNQ xen/include/xen/timex.h
   1.175 +3ddb79c2e2C14HkndNEJlYwXaPrF5A xen/include/xen/tqueue.h
   1.176 +403a3edbG9K5uZjuY19_LORbQGmFbA xen/include/xen/trace.h
   1.177 +3ddb79c1-kVvF8cVa0k3ZHDdBMj01Q xen/include/xen/types.h
   1.178 +3f055a3dwldYR102YcSuBaxIf9t3Jw xen/include/xen/vbd.h
   1.179 +3e8827bdaqPeZAWGVOwswgY9bWSx4g xen/include/xen/version.h
   1.180 +3ddb79c2Ae5KpzhC9LCYG7mP_Vi4Aw xen/include/xen/vif.h
   1.181  3ddb79c4YQCQ6r0xNLLu0jfbM7pVmA xen/net/Makefile
   1.182  3ddb79c4AkfDkTCw0comx4L8wsUOMg xen/net/dev.c
   1.183  3ddb79c4x1L_soh8b-r_1jQW_37Icw xen/net/dev_mcast.c
     2.1 --- a/BitKeeper/etc/ignore	Tue Mar 23 09:33:07 2004 +0000
     2.2 +++ b/BitKeeper/etc/ignore	Tue Mar 23 09:48:06 2004 +0000
     2.3 @@ -21,7 +21,7 @@ xen/drivers/pci/devlist.h
     2.4  xen/drivers/pci/gen-devlist
     2.5  xen/include/asm
     2.6  xen/include/hypervisor-ifs/arch
     2.7 -xen/include/xeno/compile.h
     2.8 +xen/include/xen/compile.h
     2.9  xen/tools/elf-reloc
    2.10  xen/tools/figlet/figlet
    2.11  TAGS
     3.1 --- a/xen/Makefile	Tue Mar 23 09:33:07 2004 +0000
     3.2 +++ b/xen/Makefile	Tue Mar 23 09:48:06 2004 +0000
     3.3 @@ -9,7 +9,7 @@ export BASEDIR          := $(shell pwd)
     3.4  
     3.5  include Rules.mk
     3.6  
     3.7 -GENERATED_FILES := include/xeno/compile.h
     3.8 +GENERATED_FILES := include/xen/compile.h
     3.9  
    3.10  default: $(TARGET)
    3.11  	gzip -f -9 < $(TARGET) > $(TARGET).gz
    3.12 @@ -49,7 +49,7 @@ delete-unfresh-files:
    3.13  	rm -f $(GENERATED_FILES) common/kernel.o
    3.14  
    3.15  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
    3.16 -include/xeno/compile.h:
    3.17 +include/xen/compile.h:
    3.18  	@LANG=C echo /\* Autogenerated by root Makefile. Do not edit. \*/ > $@
    3.19  	@LANG=C echo >> $@
    3.20  	@LANG=C echo \#define XEN_COMPILE_DATE \"`date`\" >> $@
     4.1 --- a/xen/Rules.mk	Tue Mar 23 09:33:07 2004 +0000
     4.2 +++ b/xen/Rules.mk	Tue Mar 23 09:48:06 2004 +0000
     4.3 @@ -2,12 +2,12 @@ COMPILE_ARCH := $(shell uname -m | sed -
     4.4  TARGET_ARCH  ?= $(COMPILE_ARCH)
     4.5  
     4.6  TARGET  := $(BASEDIR)/xen
     4.7 -HDRS    := $(wildcard $(BASEDIR)/include/xeno/*.h)
     4.8 +HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
     4.9  HDRS    += $(wildcard $(BASEDIR)/include/scsi/*.h)
    4.10  HDRS    += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h)
    4.11  HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
    4.12  # compile.h is always regenerated, but other files shouldn't be rebuilt
    4.13 -HDRS    := $(subst $(BASEDIR)/include/xeno/compile.h,,$(HDRS))
    4.14 +HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))
    4.15  
    4.16  C_SRCS  := $(wildcard *.c)
    4.17  S_SRCS  := $(wildcard *.S)
     5.1 --- a/xen/arch/i386/Rules.mk	Tue Mar 23 09:33:07 2004 +0000
     5.2 +++ b/xen/arch/i386/Rules.mk	Tue Mar 23 09:48:06 2004 +0000
     5.3 @@ -15,6 +15,6 @@ CFLAGS  += -Wno-pointer-arith -Wredundan
     5.4  TARGET_CPU := i686
     5.5  CFLAGS += -march=$(TARGET_CPU)
     5.6  LDARCHFLAGS := --oformat elf32-i386 
     5.7 -LDFLAGS := -T xeno.lds -N 
     5.8 +LDFLAGS := -T xen.lds -N 
     5.9  
    5.10  
     6.1 --- a/xen/arch/i386/acpitable.c	Tue Mar 23 09:33:07 2004 +0000
     6.2 +++ b/xen/arch/i386/acpitable.c	Tue Mar 23 09:48:06 2004 +0000
     6.3 @@ -27,12 +27,12 @@
     6.4   *
     6.5   * $Id: acpitable.c,v 1.7 2001/11/04 12:21:18 fenrus Exp $
     6.6   */
     6.7 -#include <xeno/config.h>
     6.8 -#include <xeno/kernel.h>
     6.9 -#include <xeno/init.h>
    6.10 -#include <xeno/types.h>
    6.11 -#include <xeno/slab.h>
    6.12 -#include <xeno/pci.h>
    6.13 +#include <xen/config.h>
    6.14 +#include <xen/kernel.h>
    6.15 +#include <xen/init.h>
    6.16 +#include <xen/types.h>
    6.17 +#include <xen/slab.h>
    6.18 +#include <xen/pci.h>
    6.19  #include <asm/mpspec.h>
    6.20  #include <asm/io.h>
    6.21  #include <asm/apic.h>
     7.1 --- a/xen/arch/i386/apic.c	Tue Mar 23 09:33:07 2004 +0000
     7.2 +++ b/xen/arch/i386/apic.c	Tue Mar 23 09:48:06 2004 +0000
     7.3 @@ -31,26 +31,26 @@
     7.4   */
     7.5  
     7.6  
     7.7 -#include <xeno/config.h>
     7.8 -#include <xeno/init.h>
     7.9 -#include <xeno/sched.h>
    7.10 -#include <xeno/irq.h>
    7.11 -#include <xeno/delay.h>
    7.12 +#include <xen/config.h>
    7.13 +#include <xen/init.h>
    7.14 +#include <xen/sched.h>
    7.15 +#include <xen/irq.h>
    7.16 +#include <xen/delay.h>
    7.17  #include <asm/mc146818rtc.h>
    7.18  #include <asm/msr.h>
    7.19 -#include <xeno/errno.h>
    7.20 +#include <xen/errno.h>
    7.21  #include <asm/atomic.h>
    7.22 -#include <xeno/smp.h>
    7.23 -#include <xeno/interrupt.h>
    7.24 +#include <xen/smp.h>
    7.25 +#include <xen/interrupt.h>
    7.26  #include <asm/mpspec.h>
    7.27  #include <asm/pgalloc.h>
    7.28  #include <asm/hardirq.h>
    7.29  #include <asm/apic.h>
    7.30 -#include <xeno/mm.h>
    7.31 +#include <xen/mm.h>
    7.32  #include <asm/io_apic.h>
    7.33  #include <asm/timex.h>
    7.34 -#include <xeno/ac_timer.h>
    7.35 -#include <xeno/perfc.h>
    7.36 +#include <xen/ac_timer.h>
    7.37 +#include <xen/perfc.h>
    7.38  
    7.39  #undef APIC_TIME_TRACE
    7.40  #ifdef APIC_TIME_TRACE
     8.1 --- a/xen/arch/i386/boot/boot.S	Tue Mar 23 09:33:07 2004 +0000
     8.2 +++ b/xen/arch/i386/boot/boot.S	Tue Mar 23 09:48:06 2004 +0000
     8.3 @@ -1,4 +1,4 @@
     8.4 -#include <xeno/config.h>
     8.5 +#include <xen/config.h>
     8.6  #include <hypervisor-ifs/hypervisor-if.h>
     8.7  #include <asm/page.h>
     8.8  
     9.1 --- a/xen/arch/i386/delay.c	Tue Mar 23 09:33:07 2004 +0000
     9.2 +++ b/xen/arch/i386/delay.c	Tue Mar 23 09:48:06 2004 +0000
     9.3 @@ -10,8 +10,8 @@
     9.4   *	we have to worry about.
     9.5   */
     9.6  
     9.7 -#include <xeno/config.h>
     9.8 -#include <xeno/delay.h>
     9.9 +#include <xen/config.h>
    9.10 +#include <xen/delay.h>
    9.11  #include <asm/msr.h>
    9.12  #include <asm/processor.h>
    9.13  
    10.1 --- a/xen/arch/i386/domain_page.c	Tue Mar 23 09:33:07 2004 +0000
    10.2 +++ b/xen/arch/i386/domain_page.c	Tue Mar 23 09:48:06 2004 +0000
    10.3 @@ -11,10 +11,10 @@
    10.4   * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
    10.5   */
    10.6  
    10.7 -#include <xeno/config.h>
    10.8 -#include <xeno/sched.h>
    10.9 -#include <xeno/mm.h>
   10.10 -#include <xeno/perfc.h>
   10.11 +#include <xen/config.h>
   10.12 +#include <xen/sched.h>
   10.13 +#include <xen/mm.h>
   10.14 +#include <xen/perfc.h>
   10.15  #include <asm/domain_page.h>
   10.16  #include <asm/pgalloc.h>
   10.17  
    11.1 --- a/xen/arch/i386/entry.S	Tue Mar 23 09:33:07 2004 +0000
    11.2 +++ b/xen/arch/i386/entry.S	Tue Mar 23 09:48:06 2004 +0000
    11.3 @@ -79,8 +79,8 @@
    11.4   * handler in good order (absolutely no faults allowed!).
    11.5   */
    11.6  
    11.7 -#include <xeno/config.h>
    11.8 -#include <xeno/errno.h>
    11.9 +#include <xen/config.h>
   11.10 +#include <xen/errno.h>
   11.11  #include <hypervisor-ifs/hypervisor-if.h>
   11.12  
   11.13  EBX		= 0x00
    12.1 --- a/xen/arch/i386/extable.c	Tue Mar 23 09:33:07 2004 +0000
    12.2 +++ b/xen/arch/i386/extable.c	Tue Mar 23 09:48:06 2004 +0000
    12.3 @@ -2,9 +2,9 @@
    12.4   * linux/arch/i386/mm/extable.c
    12.5   */
    12.6  
    12.7 -#include <xeno/config.h>
    12.8 -#include <xeno/module.h>
    12.9 -#include <xeno/spinlock.h>
   12.10 +#include <xen/config.h>
   12.11 +#include <xen/module.h>
   12.12 +#include <xen/spinlock.h>
   12.13  #include <asm/uaccess.h>
   12.14  
   12.15  extern const struct exception_table_entry __start___ex_table[];
    13.1 --- a/xen/arch/i386/flushtlb.c	Tue Mar 23 09:33:07 2004 +0000
    13.2 +++ b/xen/arch/i386/flushtlb.c	Tue Mar 23 09:48:06 2004 +0000
    13.3 @@ -7,8 +7,8 @@
    13.4   * Copyright (c) 2003, K A Fraser
    13.5   */
    13.6  
    13.7 -#include <xeno/config.h>
    13.8 -#include <xeno/sched.h>
    13.9 +#include <xen/config.h>
   13.10 +#include <xen/sched.h>
   13.11  #include <asm/flushtlb.h>
   13.12  
   13.13  unsigned long tlbflush_mask;
    14.1 --- a/xen/arch/i386/i387.c	Tue Mar 23 09:33:07 2004 +0000
    14.2 +++ b/xen/arch/i386/i387.c	Tue Mar 23 09:48:06 2004 +0000
    14.3 @@ -8,8 +8,8 @@
    14.4   *	Gareth Hughes <gareth@valinux.com>, May 2000
    14.5   */
    14.6  
    14.7 -#include <xeno/config.h>
    14.8 -#include <xeno/sched.h>
    14.9 +#include <xen/config.h>
   14.10 +#include <xen/sched.h>
   14.11  #include <asm/processor.h>
   14.12  #include <asm/i387.h>
   14.13  
    15.1 --- a/xen/arch/i386/i8259.c	Tue Mar 23 09:33:07 2004 +0000
    15.2 +++ b/xen/arch/i386/i8259.c	Tue Mar 23 09:48:06 2004 +0000
    15.3 @@ -5,20 +5,20 @@
    15.4   * tables for IO APICS as well as uniprocessor 8259-alikes.
    15.5   */
    15.6  
    15.7 -#include <xeno/config.h>
    15.8 -#include <xeno/init.h>
    15.9 +#include <xen/config.h>
   15.10 +#include <xen/init.h>
   15.11  #include <asm/ptrace.h>
   15.12 -#include <xeno/errno.h>
   15.13 -#include <xeno/sched.h>
   15.14 -#include <xeno/interrupt.h>
   15.15 -#include <xeno/irq.h>
   15.16 +#include <xen/errno.h>
   15.17 +#include <xen/sched.h>
   15.18 +#include <xen/interrupt.h>
   15.19 +#include <xen/irq.h>
   15.20  
   15.21  #include <asm/atomic.h>
   15.22  #include <asm/system.h>
   15.23  #include <asm/io.h>
   15.24  #include <asm/desc.h>
   15.25  #include <asm/bitops.h>
   15.26 -#include <xeno/delay.h>
   15.27 +#include <xen/delay.h>
   15.28  #include <asm/apic.h>
   15.29  
   15.30  
    16.1 --- a/xen/arch/i386/idle0_task.c	Tue Mar 23 09:33:07 2004 +0000
    16.2 +++ b/xen/arch/i386/idle0_task.c	Tue Mar 23 09:48:06 2004 +0000
    16.3 @@ -1,5 +1,5 @@
    16.4 -#include <xeno/config.h>
    16.5 -#include <xeno/sched.h>
    16.6 +#include <xen/config.h>
    16.7 +#include <xen/sched.h>
    16.8  #include <asm/desc.h>
    16.9  
   16.10  struct task_struct idle0_task = IDLE0_TASK(idle0_task);
    17.1 --- a/xen/arch/i386/io_apic.c	Tue Mar 23 09:33:07 2004 +0000
    17.2 +++ b/xen/arch/i386/io_apic.c	Tue Mar 23 09:48:06 2004 +0000
    17.3 @@ -19,13 +19,13 @@
    17.4   *					for testing these extensively
    17.5   */
    17.6  
    17.7 -#include <xeno/config.h>
    17.8 -#include <xeno/init.h>
    17.9 -#include <xeno/interrupt.h>
   17.10 -#include <xeno/irq.h>
   17.11 -#include <xeno/delay.h>
   17.12 -#include <xeno/sched.h>
   17.13 -#include <xeno/config.h>
   17.14 +#include <xen/config.h>
   17.15 +#include <xen/init.h>
   17.16 +#include <xen/interrupt.h>
   17.17 +#include <xen/irq.h>
   17.18 +#include <xen/delay.h>
   17.19 +#include <xen/sched.h>
   17.20 +#include <xen/config.h>
   17.21  #include <asm/mc146818rtc.h>
   17.22  #include <asm/io.h>
   17.23  #include <asm/mpspec.h>
    18.1 --- a/xen/arch/i386/ioremap.c	Tue Mar 23 09:33:07 2004 +0000
    18.2 +++ b/xen/arch/i386/ioremap.c	Tue Mar 23 09:48:06 2004 +0000
    18.3 @@ -8,9 +8,9 @@
    18.4   * (C) Copyright 1995 1996 Linus Torvalds
    18.5   */
    18.6  
    18.7 -#include <xeno/config.h>
    18.8 -#include <xeno/lib.h>
    18.9 -#include <xeno/mm.h>
   18.10 +#include <xen/config.h>
   18.11 +#include <xen/lib.h>
   18.12 +#include <xen/mm.h>
   18.13  #include <asm/io.h>
   18.14  #include <asm/pgalloc.h>
   18.15  #include <asm/page.h>
    19.1 --- a/xen/arch/i386/irq.c	Tue Mar 23 09:33:07 2004 +0000
    19.2 +++ b/xen/arch/i386/irq.c	Tue Mar 23 09:48:06 2004 +0000
    19.3 @@ -17,13 +17,13 @@
    19.4   * Naturally it's not a 1:1 relation, but there are similarities.
    19.5   */
    19.6  
    19.7 -#include <xeno/config.h>
    19.8 -#include <xeno/init.h>
    19.9 -#include <xeno/errno.h>
   19.10 -#include <xeno/sched.h>
   19.11 -#include <xeno/interrupt.h>
   19.12 -#include <xeno/irq.h>
   19.13 -#include <xeno/slab.h>
   19.14 +#include <xen/config.h>
   19.15 +#include <xen/init.h>
   19.16 +#include <xen/errno.h>
   19.17 +#include <xen/sched.h>
   19.18 +#include <xen/interrupt.h>
   19.19 +#include <xen/irq.h>
   19.20 +#include <xen/slab.h>
   19.21  #include <asm/mpspec.h>
   19.22  #include <asm/io_apic.h>
   19.23  #include <asm/msr.h>
   19.24 @@ -35,9 +35,9 @@
   19.25  #include <asm/system.h>
   19.26  #include <asm/bitops.h>
   19.27  #include <asm/pgalloc.h>
   19.28 -#include <xeno/delay.h>
   19.29 -#include <xeno/timex.h>
   19.30 -#include <xeno/perfc.h>
   19.31 +#include <xen/delay.h>
   19.32 +#include <xen/timex.h>
   19.33 +#include <xen/perfc.h>
   19.34  
   19.35  /*
   19.36   * Linux has a controller-independent x86 interrupt architecture.
    20.1 --- a/xen/arch/i386/mm.c	Tue Mar 23 09:33:07 2004 +0000
    20.2 +++ b/xen/arch/i386/mm.c	Tue Mar 23 09:48:06 2004 +0000
    20.3 @@ -18,10 +18,10 @@
    20.4   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    20.5   */
    20.6  
    20.7 -#include <xeno/config.h>
    20.8 -#include <xeno/lib.h>
    20.9 -#include <xeno/init.h>
   20.10 -#include <xeno/mm.h>
   20.11 +#include <xen/config.h>
   20.12 +#include <xen/lib.h>
   20.13 +#include <xen/init.h>
   20.14 +#include <xen/mm.h>
   20.15  #include <asm/page.h>
   20.16  #include <asm/pgalloc.h>
   20.17  #include <asm/fixmap.h>
    21.1 --- a/xen/arch/i386/mpparse.c	Tue Mar 23 09:33:07 2004 +0000
    21.2 +++ b/xen/arch/i386/mpparse.c	Tue Mar 23 09:48:06 2004 +0000
    21.3 @@ -12,17 +12,17 @@
    21.4   *	Maciej W. Rozycki	:	Bits for default MP configurations
    21.5   */
    21.6  
    21.7 -#include <xeno/config.h>
    21.8 -#include <xeno/init.h>
    21.9 -#include <xeno/lib.h>
   21.10 +#include <xen/config.h>
   21.11 +#include <xen/init.h>
   21.12 +#include <xen/lib.h>
   21.13  #include <asm/io.h>
   21.14 -#include <xeno/irq.h>
   21.15 -#include <xeno/smp.h>
   21.16 +#include <xen/irq.h>
   21.17 +#include <xen/smp.h>
   21.18  #include <asm/apic.h>
   21.19  #include <asm/mpspec.h>
   21.20  #include <asm/pgalloc.h>
   21.21  #include <asm/smpboot.h>
   21.22 -#include <xeno/kernel.h>
   21.23 +#include <xen/kernel.h>
   21.24  
   21.25  int numnodes = 1; /* XXX Xen */
   21.26  
    22.1 --- a/xen/arch/i386/nmi.c	Tue Mar 23 09:33:07 2004 +0000
    22.2 +++ b/xen/arch/i386/nmi.c	Tue Mar 23 09:48:06 2004 +0000
    22.3 @@ -12,16 +12,16 @@
    22.4   *  Keir Fraser         : Pentium 4 Hyperthreading support
    22.5   */
    22.6  
    22.7 -#include <xeno/config.h>
    22.8 -#include <xeno/init.h>
    22.9 -#include <xeno/lib.h>
   22.10 -#include <xeno/mm.h>
   22.11 -#include <xeno/irq.h>
   22.12 -#include <xeno/delay.h>
   22.13 -#include <xeno/interrupt.h>
   22.14 -#include <xeno/time.h>
   22.15 -#include <xeno/timex.h>
   22.16 -#include <xeno/sched.h>
   22.17 +#include <xen/config.h>
   22.18 +#include <xen/init.h>
   22.19 +#include <xen/lib.h>
   22.20 +#include <xen/mm.h>
   22.21 +#include <xen/irq.h>
   22.22 +#include <xen/delay.h>
   22.23 +#include <xen/interrupt.h>
   22.24 +#include <xen/time.h>
   22.25 +#include <xen/timex.h>
   22.26 +#include <xen/sched.h>
   22.27  
   22.28  #include <asm/mc146818rtc.h>
   22.29  #include <asm/smp.h>
    23.1 --- a/xen/arch/i386/pci-dma.c	Tue Mar 23 09:33:07 2004 +0000
    23.2 +++ b/xen/arch/i386/pci-dma.c	Tue Mar 23 09:48:06 2004 +0000
    23.3 @@ -7,10 +7,10 @@
    23.4   * in asm/pci.h.
    23.5   */
    23.6  
    23.7 -#include <xeno/types.h>
    23.8 -#include <xeno/mm.h>
    23.9 -#include <xeno/lib.h>
   23.10 -#include <xeno/pci.h>
   23.11 +#include <xen/types.h>
   23.12 +#include <xen/mm.h>
   23.13 +#include <xen/lib.h>
   23.14 +#include <xen/pci.h>
   23.15  #include <asm/io.h>
   23.16  
   23.17  void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
    24.1 --- a/xen/arch/i386/pci-i386.c	Tue Mar 23 09:33:07 2004 +0000
    24.2 +++ b/xen/arch/i386/pci-i386.c	Tue Mar 23 09:48:06 2004 +0000
    24.3 @@ -85,12 +85,12 @@
    24.4   * Oct  8, 1999 : Split to pci-i386.c, pci-pc.c and pci-visws.c. [mj]
    24.5   */
    24.6  
    24.7 -#include <xeno/types.h>
    24.8 -#include <xeno/lib.h>
    24.9 -#include <xeno/pci.h>
   24.10 -#include <xeno/init.h>
   24.11 -#include <xeno/ioport.h>
   24.12 -#include <xeno/errno.h>
   24.13 +#include <xen/types.h>
   24.14 +#include <xen/lib.h>
   24.15 +#include <xen/pci.h>
   24.16 +#include <xen/init.h>
   24.17 +#include <xen/ioport.h>
   24.18 +#include <xen/errno.h>
   24.19  
   24.20  #include "pci-i386.h"
   24.21  
    25.1 --- a/xen/arch/i386/pci-irq.c	Tue Mar 23 09:33:07 2004 +0000
    25.2 +++ b/xen/arch/i386/pci-irq.c	Tue Mar 23 09:48:06 2004 +0000
    25.3 @@ -4,14 +4,14 @@
    25.4   *	(c) 1999--2000 Martin Mares <mj@ucw.cz>
    25.5   */
    25.6  
    25.7 -#include <xeno/config.h>
    25.8 -#include <xeno/types.h>
    25.9 -#include <xeno/pci.h>
   25.10 -#include <xeno/init.h>
   25.11 -#include <xeno/slab.h>
   25.12 -#include <xeno/interrupt.h>
   25.13 -#include <xeno/irq.h>
   25.14 -#include <xeno/sched.h>
   25.15 +#include <xen/config.h>
   25.16 +#include <xen/types.h>
   25.17 +#include <xen/pci.h>
   25.18 +#include <xen/init.h>
   25.19 +#include <xen/slab.h>
   25.20 +#include <xen/interrupt.h>
   25.21 +#include <xen/irq.h>
   25.22 +#include <xen/sched.h>
   25.23  #include <asm/io.h>
   25.24  #include <asm/smp.h>
   25.25  #include <asm/mpspec.h>
    26.1 --- a/xen/arch/i386/pci-pc.c	Tue Mar 23 09:33:07 2004 +0000
    26.2 +++ b/xen/arch/i386/pci-pc.c	Tue Mar 23 09:48:06 2004 +0000
    26.3 @@ -4,13 +4,13 @@
    26.4   *	(c) 1999--2000 Martin Mares <mj@ucw.cz>
    26.5   */
    26.6  
    26.7 -#include <xeno/config.h>
    26.8 -#include <xeno/types.h>
    26.9 -/*#include <xeno/kernel.h>*/
   26.10 -#include <xeno/sched.h>
   26.11 -#include <xeno/pci.h>
   26.12 -#include <xeno/init.h>
   26.13 -#include <xeno/ioport.h>
   26.14 +#include <xen/config.h>
   26.15 +#include <xen/types.h>
   26.16 +/*#include <xen/kernel.h>*/
   26.17 +#include <xen/sched.h>
   26.18 +#include <xen/pci.h>
   26.19 +#include <xen/init.h>
   26.20 +#include <xen/ioport.h>
   26.21  
   26.22  /*#include <asm/segment.h>*/
   26.23  #include <asm/io.h>
    27.1 --- a/xen/arch/i386/pdb-stub.c	Tue Mar 23 09:33:07 2004 +0000
    27.2 +++ b/xen/arch/i386/pdb-stub.c	Tue Mar 23 09:48:06 2004 +0000
    27.3 @@ -1,11 +1,11 @@
    27.4 -#include <xeno/lib.h>
    27.5 -#include <xeno/sched.h>
    27.6 +#include <xen/lib.h>
    27.7 +#include <xen/sched.h>
    27.8  #include <asm-i386/ptrace.h>
    27.9 -#include <xeno/keyhandler.h> 
   27.10 +#include <xen/keyhandler.h> 
   27.11  #include <asm/apic.h>
   27.12  #include <asm/pdb.h>
   27.13 -#include <xeno/list.h>
   27.14 -#include <xeno/serial.h>
   27.15 +#include <xen/list.h>
   27.16 +#include <xen/serial.h>
   27.17  
   27.18  #define BUFMAX 400
   27.19  
    28.1 --- a/xen/arch/i386/process.c	Tue Mar 23 09:33:07 2004 +0000
    28.2 +++ b/xen/arch/i386/process.c	Tue Mar 23 09:48:06 2004 +0000
    28.3 @@ -12,14 +12,14 @@
    28.4   */
    28.5  
    28.6  #define __KERNEL_SYSCALLS__
    28.7 -#include <xeno/config.h>
    28.8 -#include <xeno/lib.h>
    28.9 -#include <xeno/errno.h>
   28.10 -#include <xeno/sched.h>
   28.11 -#include <xeno/smp.h>
   28.12 +#include <xen/config.h>
   28.13 +#include <xen/lib.h>
   28.14 +#include <xen/errno.h>
   28.15 +#include <xen/sched.h>
   28.16 +#include <xen/smp.h>
   28.17  #include <asm/ptrace.h>
   28.18 -#include <xeno/delay.h>
   28.19 -#include <xeno/interrupt.h>
   28.20 +#include <xen/delay.h>
   28.21 +#include <xen/interrupt.h>
   28.22  #include <asm/mc146818rtc.h>
   28.23  
   28.24  #include <asm/system.h>
   28.25 @@ -30,8 +30,8 @@
   28.26  #include <asm/mpspec.h>
   28.27  #include <asm/ldt.h>
   28.28  
   28.29 -#include <xeno/irq.h>
   28.30 -#include <xeno/event.h>
   28.31 +#include <xen/irq.h>
   28.32 +#include <xen/event.h>
   28.33  
   28.34  int hlt_counter;
   28.35  
    29.1 --- a/xen/arch/i386/setup.c	Tue Mar 23 09:33:07 2004 +0000
    29.2 +++ b/xen/arch/i386/setup.c	Tue Mar 23 09:48:06 2004 +0000
    29.3 @@ -1,11 +1,11 @@
    29.4  
    29.5 -#include <xeno/config.h>
    29.6 -#include <xeno/init.h>
    29.7 -#include <xeno/interrupt.h>
    29.8 -#include <xeno/lib.h>
    29.9 -#include <xeno/sched.h>
   29.10 -#include <xeno/pci.h>
   29.11 -#include <xeno/serial.h>
   29.12 +#include <xen/config.h>
   29.13 +#include <xen/init.h>
   29.14 +#include <xen/interrupt.h>
   29.15 +#include <xen/lib.h>
   29.16 +#include <xen/sched.h>
   29.17 +#include <xen/pci.h>
   29.18 +#include <xen/serial.h>
   29.19  #include <asm/bitops.h>
   29.20  #include <asm/smp.h>
   29.21  #include <asm/processor.h>
   29.22 @@ -14,7 +14,7 @@
   29.23  #include <asm/desc.h>
   29.24  #include <asm/domain_page.h>
   29.25  #include <asm/pdb.h>
   29.26 -#include <xeno/trace.h>
   29.27 +#include <xen/trace.h>
   29.28  
   29.29  struct cpuinfo_x86 boot_cpu_data = { 0 };
   29.30  /* Lots of nice things, since we only target PPro+. */
   29.31 @@ -404,7 +404,7 @@ void __init start_of_day(void)
   29.32      }
   29.33  
   29.34      ac_timer_init();    /* init accurate timers */
   29.35 -    init_xeno_time();	/* initialise the time */
   29.36 +    init_xen_time();	/* initialise the time */
   29.37      schedulers_start(); /* start scheduler for each CPU */
   29.38  
   29.39      sti();
    30.1 --- a/xen/arch/i386/smp.c	Tue Mar 23 09:33:07 2004 +0000
    30.2 +++ b/xen/arch/i386/smp.c	Tue Mar 23 09:48:06 2004 +0000
    30.3 @@ -8,10 +8,10 @@
    30.4   *	later.
    30.5   */
    30.6  
    30.7 -#include <xeno/irq.h>
    30.8 -#include <xeno/sched.h>
    30.9 -#include <xeno/delay.h>
   30.10 -#include <xeno/spinlock.h>
   30.11 +#include <xen/irq.h>
   30.12 +#include <xen/sched.h>
   30.13 +#include <xen/delay.h>
   30.14 +#include <xen/spinlock.h>
   30.15  #include <asm/smp.h>
   30.16  #include <asm/mc146818rtc.h>
   30.17  #include <asm/pgalloc.h>
    31.1 --- a/xen/arch/i386/smpboot.c	Tue Mar 23 09:33:07 2004 +0000
    31.2 +++ b/xen/arch/i386/smpboot.c	Tue Mar 23 09:48:06 2004 +0000
    31.3 @@ -32,23 +32,23 @@
    31.4   *		Martin J. Bligh	: 	Added support for multi-quad systems
    31.5   */
    31.6  
    31.7 -#include <xeno/config.h>
    31.8 -#include <xeno/init.h>
    31.9 -#include <xeno/interrupt.h>
   31.10 -#include <xeno/irq.h>
   31.11 -#include <xeno/mm.h>
   31.12 -#include <xeno/slab.h>
   31.13 +#include <xen/config.h>
   31.14 +#include <xen/init.h>
   31.15 +#include <xen/interrupt.h>
   31.16 +#include <xen/irq.h>
   31.17 +#include <xen/mm.h>
   31.18 +#include <xen/slab.h>
   31.19  #include <asm/pgalloc.h>
   31.20  #include <asm/mc146818rtc.h>
   31.21  #include <asm/smpboot.h>
   31.22 -#include <xeno/smp.h>
   31.23 +#include <xen/smp.h>
   31.24  #include <asm/msr.h>
   31.25  #include <asm/system.h>
   31.26  #include <asm/mpspec.h>
   31.27  #include <asm/io_apic.h>
   31.28 -#include <xeno/sched.h>
   31.29 -#include <xeno/delay.h>
   31.30 -#include <xeno/lib.h>
   31.31 +#include <xen/sched.h>
   31.32 +#include <xen/delay.h>
   31.33 +#include <xen/lib.h>
   31.34  
   31.35  #ifdef CONFIG_SMP
   31.36  
    32.1 --- a/xen/arch/i386/time.c	Tue Mar 23 09:33:07 2004 +0000
    32.2 +++ b/xen/arch/i386/time.c	Tue Mar 23 09:48:06 2004 +0000
    32.3 @@ -19,18 +19,18 @@
    32.4   *  Copyright (C) 1991, 1992, 1995  Linus Torvalds
    32.5   */
    32.6  
    32.7 -#include <xeno/errno.h>
    32.8 -#include <xeno/sched.h>
    32.9 -#include <xeno/lib.h>
   32.10 -#include <xeno/config.h>
   32.11 -#include <xeno/init.h>
   32.12 -#include <xeno/interrupt.h>
   32.13 -#include <xeno/time.h>
   32.14 -#include <xeno/ac_timer.h>
   32.15 +#include <xen/errno.h>
   32.16 +#include <xen/sched.h>
   32.17 +#include <xen/lib.h>
   32.18 +#include <xen/config.h>
   32.19 +#include <xen/init.h>
   32.20 +#include <xen/interrupt.h>
   32.21 +#include <xen/time.h>
   32.22 +#include <xen/ac_timer.h>
   32.23  
   32.24  #include <asm/io.h>
   32.25 -#include <xeno/smp.h>
   32.26 -#include <xeno/irq.h>
   32.27 +#include <xen/smp.h>
   32.28 +#include <xen/irq.h>
   32.29  #include <asm/msr.h>
   32.30  #include <asm/mpspec.h>
   32.31  #include <asm/processor.h>
   32.32 @@ -329,7 +329,7 @@ void do_settime(unsigned long secs, unsi
   32.33  
   32.34  
   32.35  /* Late init function (after all CPUs are booted). */
   32.36 -int __init init_xeno_time()
   32.37 +int __init init_xen_time()
   32.38  {
   32.39      u64      scale;
   32.40      u64      full_tsc;
    33.1 --- a/xen/arch/i386/trampoline.S	Tue Mar 23 09:33:07 2004 +0000
    33.2 +++ b/xen/arch/i386/trampoline.S	Tue Mar 23 09:48:06 2004 +0000
    33.3 @@ -15,7 +15,7 @@
    33.4   *	(no relocation) and are taken with regard to r_base.
    33.5   */
    33.6  
    33.7 -#include <xeno/config.h>
    33.8 +#include <xen/config.h>
    33.9  #include <hypervisor-ifs/hypervisor-if.h>
   33.10  #include <asm/page.h>
   33.11  
    34.1 --- a/xen/arch/i386/traps.c	Tue Mar 23 09:33:07 2004 +0000
    34.2 +++ b/xen/arch/i386/traps.c	Tue Mar 23 09:48:06 2004 +0000
    34.3 @@ -27,18 +27,18 @@
    34.4   *	Gareth Hughes <gareth@valinux.com>, May 2000
    34.5   */
    34.6  
    34.7 -#include <xeno/config.h>
    34.8 -#include <xeno/init.h>
    34.9 -#include <xeno/interrupt.h>
   34.10 -#include <xeno/sched.h>
   34.11 -#include <xeno/lib.h>
   34.12 -#include <xeno/errno.h>
   34.13 -#include <xeno/mm.h>
   34.14 +#include <xen/config.h>
   34.15 +#include <xen/init.h>
   34.16 +#include <xen/interrupt.h>
   34.17 +#include <xen/sched.h>
   34.18 +#include <xen/lib.h>
   34.19 +#include <xen/errno.h>
   34.20 +#include <xen/mm.h>
   34.21  #include <asm/ptrace.h>
   34.22 -#include <xeno/delay.h>
   34.23 -#include <xeno/spinlock.h>
   34.24 -#include <xeno/irq.h>
   34.25 -#include <xeno/perfc.h>
   34.26 +#include <xen/delay.h>
   34.27 +#include <xen/spinlock.h>
   34.28 +#include <xen/irq.h>
   34.29 +#include <xen/perfc.h>
   34.30  #include <asm/domain_page.h>
   34.31  #include <asm/system.h>
   34.32  #include <asm/io.h>
    35.1 --- a/xen/arch/i386/usercopy.c	Tue Mar 23 09:33:07 2004 +0000
    35.2 +++ b/xen/arch/i386/usercopy.c	Tue Mar 23 09:48:06 2004 +0000
    35.3 @@ -5,7 +5,7 @@
    35.4   * Copyright 1997 Andi Kleen <ak@muc.de>
    35.5   * Copyright 1997 Linus Torvalds
    35.6   */
    35.7 -#include <xeno/config.h>
    35.8 +#include <xen/config.h>
    35.9  #include <asm/uaccess.h>
   35.10  //#include <asm/mmx.h>
   35.11  
    36.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.2 +++ b/xen/arch/i386/xen.lds	Tue Mar 23 09:48:06 2004 +0000
    36.3 @@ -0,0 +1,87 @@
    36.4 +/* ld script to make i386 Linux kernel
    36.5 + * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
    36.6 + */
    36.7 +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
    36.8 +OUTPUT_ARCH(i386)
    36.9 +ENTRY(start)
   36.10 +SECTIONS
   36.11 +{
   36.12 +  . = 0xFC400000 + 0x100000;
   36.13 +  _text = .;			/* Text and read-only data */
   36.14 +  .text : {
   36.15 +	*(.text)
   36.16 +	*(.fixup)
   36.17 +	*(.gnu.warning)
   36.18 +	} = 0x9090
   36.19 +  .text.lock : { *(.text.lock) }	/* out-of-line lock text */
   36.20 +
   36.21 +  _etext = .;			/* End of text section */
   36.22 +
   36.23 +  .rodata : { *(.rodata) *(.rodata.*) }
   36.24 +  .kstrtab : { *(.kstrtab) }
   36.25 +
   36.26 +  . = ALIGN(16);		/* Exception table */
   36.27 +  __start___ex_table = .;
   36.28 +  __ex_table : { *(__ex_table) }
   36.29 +  __stop___ex_table = .;
   36.30 +
   36.31 +  __start___ksymtab = .;	/* Kernel symbol table */
   36.32 +  __ksymtab : { *(__ksymtab) }
   36.33 +  __stop___ksymtab = .;
   36.34 +
   36.35 +  __start___kallsyms = .;	/* All kernel symbols */
   36.36 +  __kallsyms : { *(__kallsyms) }
   36.37 +  __stop___kallsyms = .;
   36.38 +
   36.39 +  .data : {			/* Data */
   36.40 +	*(.data)
   36.41 +	CONSTRUCTORS
   36.42 +	}
   36.43 +
   36.44 +  _edata = .;			/* End of data section */
   36.45 +
   36.46 +  . = ALIGN(8192);		/* init_task */
   36.47 +  .data.init_task : { *(.data.init_task) }
   36.48 +
   36.49 +  . = ALIGN(4096);		/* Init code and data */
   36.50 +  __init_begin = .;
   36.51 +  .text.init : { *(.text.init) }
   36.52 +  .data.init : { *(.data.init) }
   36.53 +  . = ALIGN(16);
   36.54 +  __setup_start = .;
   36.55 +  .setup.init : { *(.setup.init) }
   36.56 +  __setup_end = .;
   36.57 +  __initcall_start = .;
   36.58 +  .initcall.init : { *(.initcall.init) }
   36.59 +  __initcall_end = .;
   36.60 +  . = ALIGN(4096);
   36.61 +  __init_end = .;
   36.62 +
   36.63 +  . = ALIGN(4096);
   36.64 +  .data.page_aligned : { *(.data.idt) }
   36.65 +
   36.66 +  . = ALIGN(32);
   36.67 +  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
   36.68 +
   36.69 +  __bss_start = .;		/* BSS */
   36.70 +  .bss : {
   36.71 +	*(.bss)
   36.72 +	}
   36.73 +  _end = . ;
   36.74 +
   36.75 +  /* Sections to be discarded */
   36.76 +  /DISCARD/ : {
   36.77 +	*(.text.exit)
   36.78 +	*(.data.exit)
   36.79 +	*(.exitcall.exit)
   36.80 +	}
   36.81 +
   36.82 +  /* Stabs debugging sections.  */
   36.83 +  .stab 0 : { *(.stab) }
   36.84 +  .stabstr 0 : { *(.stabstr) }
   36.85 +  .stab.excl 0 : { *(.stab.excl) }
   36.86 +  .stab.exclstr 0 : { *(.stab.exclstr) }
   36.87 +  .stab.index 0 : { *(.stab.index) }
   36.88 +  .stab.indexstr 0 : { *(.stab.indexstr) }
   36.89 +  .comment 0 : { *(.comment) }
   36.90 +}
    37.1 --- a/xen/arch/i386/xeno.lds	Tue Mar 23 09:33:07 2004 +0000
    37.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.3 @@ -1,87 +0,0 @@
    37.4 -/* ld script to make i386 Linux kernel
    37.5 - * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
    37.6 - */
    37.7 -OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
    37.8 -OUTPUT_ARCH(i386)
    37.9 -ENTRY(start)
   37.10 -SECTIONS
   37.11 -{
   37.12 -  . = 0xFC400000 + 0x100000;
   37.13 -  _text = .;			/* Text and read-only data */
   37.14 -  .text : {
   37.15 -	*(.text)
   37.16 -	*(.fixup)
   37.17 -	*(.gnu.warning)
   37.18 -	} = 0x9090
   37.19 -  .text.lock : { *(.text.lock) }	/* out-of-line lock text */
   37.20 -
   37.21 -  _etext = .;			/* End of text section */
   37.22 -
   37.23 -  .rodata : { *(.rodata) *(.rodata.*) }
   37.24 -  .kstrtab : { *(.kstrtab) }
   37.25 -
   37.26 -  . = ALIGN(16);		/* Exception table */
   37.27 -  __start___ex_table = .;
   37.28 -  __ex_table : { *(__ex_table) }
   37.29 -  __stop___ex_table = .;
   37.30 -
   37.31 -  __start___ksymtab = .;	/* Kernel symbol table */
   37.32 -  __ksymtab : { *(__ksymtab) }
   37.33 -  __stop___ksymtab = .;
   37.34 -
   37.35 -  __start___kallsyms = .;	/* All kernel symbols */
   37.36 -  __kallsyms : { *(__kallsyms) }
   37.37 -  __stop___kallsyms = .;
   37.38 -
   37.39 -  .data : {			/* Data */
   37.40 -	*(.data)
   37.41 -	CONSTRUCTORS
   37.42 -	}
   37.43 -
   37.44 -  _edata = .;			/* End of data section */
   37.45 -
   37.46 -  . = ALIGN(8192);		/* init_task */
   37.47 -  .data.init_task : { *(.data.init_task) }
   37.48 -
   37.49 -  . = ALIGN(4096);		/* Init code and data */
   37.50 -  __init_begin = .;
   37.51 -  .text.init : { *(.text.init) }
   37.52 -  .data.init : { *(.data.init) }
   37.53 -  . = ALIGN(16);
   37.54 -  __setup_start = .;
   37.55 -  .setup.init : { *(.setup.init) }
   37.56 -  __setup_end = .;
   37.57 -  __initcall_start = .;
   37.58 -  .initcall.init : { *(.initcall.init) }
   37.59 -  __initcall_end = .;
   37.60 -  . = ALIGN(4096);
   37.61 -  __init_end = .;
   37.62 -
   37.63 -  . = ALIGN(4096);
   37.64 -  .data.page_aligned : { *(.data.idt) }
   37.65 -
   37.66 -  . = ALIGN(32);
   37.67 -  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
   37.68 -
   37.69 -  __bss_start = .;		/* BSS */
   37.70 -  .bss : {
   37.71 -	*(.bss)
   37.72 -	}
   37.73 -  _end = . ;
   37.74 -
   37.75 -  /* Sections to be discarded */
   37.76 -  /DISCARD/ : {
   37.77 -	*(.text.exit)
   37.78 -	*(.data.exit)
   37.79 -	*(.exitcall.exit)
   37.80 -	}
   37.81 -
   37.82 -  /* Stabs debugging sections.  */
   37.83 -  .stab 0 : { *(.stab) }
   37.84 -  .stabstr 0 : { *(.stabstr) }
   37.85 -  .stab.excl 0 : { *(.stab.excl) }
   37.86 -  .stab.exclstr 0 : { *(.stab.exclstr) }
   37.87 -  .stab.index 0 : { *(.stab.index) }
   37.88 -  .stab.indexstr 0 : { *(.stab.indexstr) }
   37.89 -  .comment 0 : { *(.comment) }
   37.90 -}
    38.1 --- a/xen/arch/x86_64/Rules.mk	Tue Mar 23 09:33:07 2004 +0000
    38.2 +++ b/xen/arch/x86_64/Rules.mk	Tue Mar 23 09:48:06 2004 +0000
    38.3 @@ -13,6 +13,6 @@ CFLAGS  += -fomit-frame-pointer -I$(BASE
    38.4  #CFLAGS  += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__
    38.5  CFLAGS  += -Wno-pointer-arith -Wredundant-decls -m64
    38.6  LDARCHFLAGS := 
    38.7 -LDFLAGS := -T xeno.lds -N 
    38.8 +LDFLAGS := -T xen.lds -N 
    38.9  
   38.10  
    39.1 --- a/xen/common/ac_timer.c	Tue Mar 23 09:33:07 2004 +0000
    39.2 +++ b/xen/common/ac_timer.c	Tue Mar 23 09:48:06 2004 +0000
    39.3 @@ -12,18 +12,18 @@
    39.4   * Description: Accurate timer for the Hypervisor
    39.5   */
    39.6  
    39.7 -#include <xeno/config.h>
    39.8 -#include <xeno/init.h>
    39.9 -#include <xeno/types.h>
   39.10 -#include <xeno/errno.h>
   39.11 -#include <xeno/sched.h>
   39.12 -#include <xeno/lib.h>
   39.13 -#include <xeno/smp.h>
   39.14 -#include <xeno/perfc.h>
   39.15 -#include <xeno/time.h>
   39.16 -#include <xeno/interrupt.h>
   39.17 -#include <xeno/ac_timer.h>
   39.18 -#include <xeno/keyhandler.h>
   39.19 +#include <xen/config.h>
   39.20 +#include <xen/init.h>
   39.21 +#include <xen/types.h>
   39.22 +#include <xen/errno.h>
   39.23 +#include <xen/sched.h>
   39.24 +#include <xen/lib.h>
   39.25 +#include <xen/smp.h>
   39.26 +#include <xen/perfc.h>
   39.27 +#include <xen/time.h>
   39.28 +#include <xen/interrupt.h>
   39.29 +#include <xen/ac_timer.h>
   39.30 +#include <xen/keyhandler.h>
   39.31  #include <asm/system.h>
   39.32  #include <asm/desc.h>
   39.33  
    40.1 --- a/xen/common/brlock.c	Tue Mar 23 09:33:07 2004 +0000
    40.2 +++ b/xen/common/brlock.c	Tue Mar 23 09:48:06 2004 +0000
    40.3 @@ -8,12 +8,12 @@
    40.4   * Copyright 2000, David S. Miller <davem@redhat.com>
    40.5   */
    40.6  
    40.7 -#include <xeno/config.h>
    40.8 +#include <xen/config.h>
    40.9  
   40.10  #ifdef CONFIG_SMP
   40.11  
   40.12 -#include <xeno/sched.h>
   40.13 -#include <xeno/brlock.h>
   40.14 +#include <xen/sched.h>
   40.15 +#include <xen/brlock.h>
   40.16  
   40.17  #ifdef __BRLOCK_USE_ATOMICS
   40.18  
    41.1 --- a/xen/common/debug-linux.c	Tue Mar 23 09:33:07 2004 +0000
    41.2 +++ b/xen/common/debug-linux.c	Tue Mar 23 09:48:06 2004 +0000
    41.3 @@ -1,6 +1,6 @@
    41.4 -#include <xeno/config.h>
    41.5 -#include <xeno/types.h>
    41.6 -#include <xeno/lib.h>
    41.7 +#include <xen/config.h>
    41.8 +#include <xen/types.h>
    41.9 +#include <xen/lib.h>
   41.10  #include <hypervisor-ifs/dom0_ops.h>
   41.11  #include <asm/pdb.h>
   41.12  
   41.13 @@ -12,11 +12,11 @@
   41.14  #define PIDHASH_SZ (4096 >> 2)
   41.15  #define pid_hashfn(x)	((((x) >> 8) ^ (x)) & (PIDHASH_SZ - 1))
   41.16  
   41.17 -/* from asm-xeno/pgtable-2level.h */
   41.18 +/* from asm-xen/pgtable-2level.h */
   41.19  #define PGDIR_SHIFT	22
   41.20  #define PTRS_PER_PGD	1024
   41.21  
   41.22 -/* from asm-xeno/page.h */
   41.23 +/* from asm-xen/page.h */
   41.24  #define PAGE_SHIFT	12
   41.25  #define PAGE_SIZE	(1UL << PAGE_SHIFT)
   41.26  #define PAGE_MASK	(~(PAGE_SIZE-1))
   41.27 @@ -31,7 +31,7 @@
   41.28  #define L1_PAGE_BITS ( (ENTRIES_PER_L1_PAGETABLE - 1) << PAGE_SHIFT )
   41.29  
   41.30  
   41.31 -/* adapted from asm-xeno/page.h */
   41.32 +/* adapted from asm-xen/page.h */
   41.33  static inline unsigned long machine_to_phys(domid_t domain, 
   41.34                                              unsigned long machine)
   41.35  {
    42.1 --- a/xen/common/debug.c	Tue Mar 23 09:33:07 2004 +0000
    42.2 +++ b/xen/common/debug.c	Tue Mar 23 09:48:06 2004 +0000
    42.3 @@ -4,12 +4,12 @@
    42.4   * xen pervasive debugger
    42.5   */
    42.6  
    42.7 -#include <xeno/config.h>
    42.8 -#include <xeno/types.h>
    42.9 -#include <xeno/lib.h>
   42.10 +#include <xen/config.h>
   42.11 +#include <xen/types.h>
   42.12 +#include <xen/lib.h>
   42.13  #include <hypervisor-ifs/dom0_ops.h>
   42.14 -#include <xeno/sched.h>
   42.15 -#include <xeno/event.h>
   42.16 +#include <xen/sched.h>
   42.17 +#include <xen/event.h>
   42.18  #include <asm/page.h>
   42.19  #include <asm/domain_page.h>                           /* [un]map_domain_mem */
   42.20  #include <asm/pdb.h>
    43.1 --- a/xen/common/dom0_ops.c	Tue Mar 23 09:33:07 2004 +0000
    43.2 +++ b/xen/common/dom0_ops.c	Tue Mar 23 09:48:06 2004 +0000
    43.3 @@ -6,18 +6,18 @@
    43.4   * Copyright (c) 2002, K A Fraser
    43.5   */
    43.6  
    43.7 -#include <xeno/config.h>
    43.8 -#include <xeno/types.h>
    43.9 -#include <xeno/lib.h>
   43.10 -#include <xeno/mm.h>
   43.11 +#include <xen/config.h>
   43.12 +#include <xen/types.h>
   43.13 +#include <xen/lib.h>
   43.14 +#include <xen/mm.h>
   43.15  #include <hypervisor-ifs/dom0_ops.h>
   43.16 -#include <xeno/sched.h>
   43.17 -#include <xeno/event.h>
   43.18 +#include <xen/sched.h>
   43.19 +#include <xen/event.h>
   43.20  #include <asm/domain_page.h>
   43.21  #include <asm/msr.h>
   43.22  #include <asm/pdb.h>
   43.23 -#include <xeno/trace.h>
   43.24 -#include <xeno/console.h>
   43.25 +#include <xen/trace.h>
   43.26 +#include <xen/console.h>
   43.27  #include <hypervisor-ifs/sched_ctl.h>
   43.28  
   43.29  extern unsigned int alloc_new_dom_mem(struct task_struct *, unsigned int);
    44.1 --- a/xen/common/dom_mem_ops.c	Tue Mar 23 09:33:07 2004 +0000
    44.2 +++ b/xen/common/dom_mem_ops.c	Tue Mar 23 09:48:06 2004 +0000
    44.3 @@ -6,14 +6,14 @@
    44.4   * Copyright (c) 2003, B Dragovic & K A Fraser.
    44.5   */
    44.6  
    44.7 -#include <xeno/config.h>
    44.8 -#include <xeno/types.h>
    44.9 -#include <xeno/lib.h>
   44.10 -#include <xeno/mm.h>
   44.11 +#include <xen/config.h>
   44.12 +#include <xen/types.h>
   44.13 +#include <xen/lib.h>
   44.14 +#include <xen/mm.h>
   44.15  #include <hypervisor-ifs/dom_mem_ops.h>
   44.16 -#include <xeno/perfc.h>
   44.17 -#include <xeno/sched.h>
   44.18 -#include <xeno/event.h>
   44.19 +#include <xen/perfc.h>
   44.20 +#include <xen/sched.h>
   44.21 +#include <xen/event.h>
   44.22  #include <asm/domain_page.h>
   44.23  
   44.24  static long alloc_dom_mem(struct task_struct *p, reservation_increase_t op)
    45.1 --- a/xen/common/domain.c	Tue Mar 23 09:33:07 2004 +0000
    45.2 +++ b/xen/common/domain.c	Tue Mar 23 09:48:06 2004 +0000
    45.3 @@ -1,22 +1,22 @@
    45.4 -#include <xeno/config.h>
    45.5 -#include <xeno/init.h>
    45.6 -#include <xeno/lib.h>
    45.7 -#include <xeno/errno.h>
    45.8 -#include <xeno/sched.h>
    45.9 -#include <xeno/mm.h>
   45.10 -#include <xeno/skbuff.h>
   45.11 -#include <xeno/interrupt.h>
   45.12 -#include <xeno/delay.h>
   45.13 -#include <xeno/event.h>
   45.14 -#include <xeno/time.h>
   45.15 +#include <xen/config.h>
   45.16 +#include <xen/init.h>
   45.17 +#include <xen/lib.h>
   45.18 +#include <xen/errno.h>
   45.19 +#include <xen/sched.h>
   45.20 +#include <xen/mm.h>
   45.21 +#include <xen/skbuff.h>
   45.22 +#include <xen/interrupt.h>
   45.23 +#include <xen/delay.h>
   45.24 +#include <xen/event.h>
   45.25 +#include <xen/time.h>
   45.26  #include <hypervisor-ifs/dom0_ops.h>
   45.27  #include <asm/io.h>
   45.28  #include <asm/domain_page.h>
   45.29  #include <asm/flushtlb.h>
   45.30  #include <asm/msr.h>
   45.31 -#include <xeno/blkdev.h>
   45.32 -#include <xeno/console.h>
   45.33 -#include <xeno/vbd.h>
   45.34 +#include <xen/blkdev.h>
   45.35 +#include <xen/console.h>
   45.36 +#include <xen/vbd.h>
   45.37  #include <asm/i387.h>
   45.38  
   45.39  #if !defined(CONFIG_X86_64BITMODE)
    46.1 --- a/xen/common/event.c	Tue Mar 23 09:33:07 2004 +0000
    46.2 +++ b/xen/common/event.c	Tue Mar 23 09:48:06 2004 +0000
    46.3 @@ -8,12 +8,12 @@
    46.4   * Copyright (c) 2002, K A Fraser
    46.5   */
    46.6  
    46.7 -#include <xeno/config.h>
    46.8 -#include <xeno/event.h>
    46.9 +#include <xen/config.h>
   46.10 +#include <xen/event.h>
   46.11  
   46.12  typedef void (*hyp_event_callback_fn_t)(void);
   46.13  
   46.14 -/* Ordering must match definitions of _HYP_EVENT_* in xeno/sched.h */
   46.15 +/* Ordering must match definitions of _HYP_EVENT_* in xen/sched.h */
   46.16  static hyp_event_callback_fn_t event_call_fn[] = 
   46.17  {
   46.18      __enter_scheduler,
    47.1 --- a/xen/common/event_channel.c	Tue Mar 23 09:33:07 2004 +0000
    47.2 +++ b/xen/common/event_channel.c	Tue Mar 23 09:48:06 2004 +0000
    47.3 @@ -15,12 +15,12 @@
    47.4   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    47.5   */
    47.6  
    47.7 -#include <xeno/config.h>
    47.8 -#include <xeno/init.h>
    47.9 -#include <xeno/lib.h>
   47.10 -#include <xeno/errno.h>
   47.11 -#include <xeno/sched.h>
   47.12 -#include <xeno/event.h>
   47.13 +#include <xen/config.h>
   47.14 +#include <xen/init.h>
   47.15 +#include <xen/lib.h>
   47.16 +#include <xen/errno.h>
   47.17 +#include <xen/sched.h>
   47.18 +#include <xen/event.h>
   47.19  
   47.20  #include <hypervisor-ifs/hypervisor-if.h>
   47.21  #include <hypervisor-ifs/event_channel.h>
    48.1 --- a/xen/common/kernel.c	Tue Mar 23 09:33:07 2004 +0000
    48.2 +++ b/xen/common/kernel.c	Tue Mar 23 09:48:06 2004 +0000
    48.3 @@ -8,29 +8,29 @@
    48.4   */
    48.5  
    48.6  #include <stdarg.h>
    48.7 -#include <xeno/config.h>
    48.8 -#include <xeno/lib.h>
    48.9 -#include <xeno/errno.h>
   48.10 -#include <xeno/spinlock.h>
   48.11 -#include <xeno/multiboot.h>
   48.12 -#include <xeno/sched.h>
   48.13 -#include <xeno/mm.h>
   48.14 -#include <xeno/delay.h>
   48.15 -#include <xeno/skbuff.h>
   48.16 -#include <xeno/interrupt.h>
   48.17 -#include <xeno/compile.h>
   48.18 -#include <xeno/version.h>
   48.19 -#include <xeno/netdevice.h>
   48.20 +#include <xen/config.h>
   48.21 +#include <xen/lib.h>
   48.22 +#include <xen/errno.h>
   48.23 +#include <xen/spinlock.h>
   48.24 +#include <xen/multiboot.h>
   48.25 +#include <xen/sched.h>
   48.26 +#include <xen/mm.h>
   48.27 +#include <xen/delay.h>
   48.28 +#include <xen/skbuff.h>
   48.29 +#include <xen/interrupt.h>
   48.30 +#include <xen/compile.h>
   48.31 +#include <xen/version.h>
   48.32 +#include <xen/netdevice.h>
   48.33  #include <asm/io.h>
   48.34  #include <asm/msr.h>
   48.35  #include <asm/uaccess.h>
   48.36  #include <hypervisor-ifs/dom0_ops.h>
   48.37  #include <asm/byteorder.h>
   48.38 -#include <xeno/if_ether.h>
   48.39 +#include <xen/if_ether.h>
   48.40  #include <asm/domain_page.h>
   48.41 -#include <xeno/console.h>
   48.42 -#include <xeno/net_headers.h>
   48.43 -#include <xeno/serial.h>
   48.44 +#include <xen/console.h>
   48.45 +#include <xen/net_headers.h>
   48.46 +#include <xen/serial.h>
   48.47  
   48.48  kmem_cache_t *task_struct_cachep;
   48.49  
    49.1 --- a/xen/common/keyhandler.c	Tue Mar 23 09:33:07 2004 +0000
    49.2 +++ b/xen/common/keyhandler.c	Tue Mar 23 09:48:06 2004 +0000
    49.3 @@ -1,9 +1,9 @@
    49.4  
    49.5 -#include <xeno/keyhandler.h> 
    49.6 -#include <xeno/reboot.h>
    49.7 -#include <xeno/event.h>
    49.8 -#include <xeno/console.h>
    49.9 -#include <xeno/serial.h>
   49.10 +#include <xen/keyhandler.h> 
   49.11 +#include <xen/reboot.h>
   49.12 +#include <xen/event.h>
   49.13 +#include <xen/console.h>
   49.14 +#include <xen/serial.h>
   49.15  
   49.16  #define KEY_MAX 256
   49.17  #define STR_MAX  64
    50.1 --- a/xen/common/lib.c	Tue Mar 23 09:33:07 2004 +0000
    50.2 +++ b/xen/common/lib.c	Tue Mar 23 09:48:06 2004 +0000
    50.3 @@ -1,6 +1,6 @@
    50.4  
    50.5 -#include <xeno/ctype.h>
    50.6 -#include <xeno/lib.h>
    50.7 +#include <xen/ctype.h>
    50.8 +#include <xen/lib.h>
    50.9  
   50.10  
   50.11  /* for inc/ctype.h */
    51.1 --- a/xen/common/memory.c	Tue Mar 23 09:33:07 2004 +0000
    51.2 +++ b/xen/common/memory.c	Tue Mar 23 09:48:06 2004 +0000
    51.3 @@ -125,14 +125,14 @@
    51.4   * to more aggressive flush types.
    51.5   */
    51.6  
    51.7 -#include <xeno/config.h>
    51.8 -#include <xeno/init.h>
    51.9 -#include <xeno/lib.h>
   51.10 -#include <xeno/mm.h>
   51.11 -#include <xeno/sched.h>
   51.12 -#include <xeno/errno.h>
   51.13 -#include <xeno/perfc.h>
   51.14 -#include <xeno/interrupt.h>
   51.15 +#include <xen/config.h>
   51.16 +#include <xen/init.h>
   51.17 +#include <xen/lib.h>
   51.18 +#include <xen/mm.h>
   51.19 +#include <xen/sched.h>
   51.20 +#include <xen/errno.h>
   51.21 +#include <xen/perfc.h>
   51.22 +#include <xen/interrupt.h>
   51.23  #include <asm/page.h>
   51.24  #include <asm/flushtlb.h>
   51.25  #include <asm/io.h>
    52.1 --- a/xen/common/network.c	Tue Mar 23 09:33:07 2004 +0000
    52.2 +++ b/xen/common/network.c	Tue Mar 23 09:48:06 2004 +0000
    52.3 @@ -23,15 +23,15 @@
    52.4   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    52.5   */
    52.6  
    52.7 -#include <xeno/sched.h>
    52.8 -#include <xeno/errno.h>
    52.9 -#include <xeno/init.h>
   52.10 -#include <xeno/slab.h>
   52.11 -#include <xeno/spinlock.h>
   52.12 -#include <xeno/if_ether.h>
   52.13 -#include <xeno/skbuff.h>
   52.14 -#include <xeno/netdevice.h>
   52.15 -#include <xeno/in.h>
   52.16 +#include <xen/sched.h>
   52.17 +#include <xen/errno.h>
   52.18 +#include <xen/init.h>
   52.19 +#include <xen/slab.h>
   52.20 +#include <xen/spinlock.h>
   52.21 +#include <xen/if_ether.h>
   52.22 +#include <xen/skbuff.h>
   52.23 +#include <xen/netdevice.h>
   52.24 +#include <xen/in.h>
   52.25  #include <asm/domain_page.h>
   52.26  #include <asm/io.h>
   52.27  #include <hypervisor-ifs/network.h>
    53.1 --- a/xen/common/page_alloc.c	Tue Mar 23 09:33:07 2004 +0000
    53.2 +++ b/xen/common/page_alloc.c	Tue Mar 23 09:48:06 2004 +0000
    53.3 @@ -20,13 +20,13 @@
    53.4   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    53.5   */
    53.6  
    53.7 -#include <xeno/config.h>
    53.8 -#include <xeno/init.h>
    53.9 -#include <xeno/types.h>
   53.10 -#include <xeno/lib.h>
   53.11 +#include <xen/config.h>
   53.12 +#include <xen/init.h>
   53.13 +#include <xen/types.h>
   53.14 +#include <xen/lib.h>
   53.15  #include <asm/page.h>
   53.16 -#include <xeno/spinlock.h>
   53.17 -#include <xeno/slab.h>
   53.18 +#include <xen/spinlock.h>
   53.19 +#include <xen/slab.h>
   53.20  
   53.21  static spinlock_t alloc_lock = SPIN_LOCK_UNLOCKED;
   53.22  
    54.1 --- a/xen/common/perfc.c	Tue Mar 23 09:33:07 2004 +0000
    54.2 +++ b/xen/common/perfc.c	Tue Mar 23 09:48:06 2004 +0000
    54.3 @@ -1,9 +1,9 @@
    54.4  
    54.5 -#include <xeno/lib.h>
    54.6 -#include <xeno/smp.h>
    54.7 -#include <xeno/time.h>
    54.8 -#include <xeno/perfc.h>
    54.9 -#include <xeno/keyhandler.h> 
   54.10 +#include <xen/lib.h>
   54.11 +#include <xen/smp.h>
   54.12 +#include <xen/time.h>
   54.13 +#include <xen/perfc.h>
   54.14 +#include <xen/keyhandler.h> 
   54.15  
   54.16  #undef  PERFCOUNTER
   54.17  #undef  PERFCOUNTER_CPU
   54.18 @@ -16,7 +16,7 @@ static struct {
   54.19      enum { TYPE_SINGLE, TYPE_CPU, TYPE_ARRAY } type;
   54.20      int nr_elements;
   54.21  } perfc_info[] = {
   54.22 -#include <xeno/perfc_defn.h>
   54.23 +#include <xen/perfc_defn.h>
   54.24  };
   54.25  
   54.26  #define NR_PERFCTRS (sizeof(perfc_info) / sizeof(perfc_info[0]))
    55.1 --- a/xen/common/physdev.c	Tue Mar 23 09:33:07 2004 +0000
    55.2 +++ b/xen/common/physdev.c	Tue Mar 23 09:48:06 2004 +0000
    55.3 @@ -36,13 +36,13 @@
    55.4   */
    55.5  
    55.6  
    55.7 -#include <xeno/config.h>
    55.8 -#include <xeno/lib.h>
    55.9 -#include <xeno/types.h>
   55.10 -#include <xeno/sched.h>
   55.11 -#include <xeno/pci.h>
   55.12 -#include <xeno/irq.h>
   55.13 -#include <xeno/event.h>
   55.14 +#include <xen/config.h>
   55.15 +#include <xen/lib.h>
   55.16 +#include <xen/types.h>
   55.17 +#include <xen/sched.h>
   55.18 +#include <xen/pci.h>
   55.19 +#include <xen/irq.h>
   55.20 +#include <xen/event.h>
   55.21  #include <asm/pci.h>
   55.22  #include <hypervisor-ifs/hypervisor-if.h>
   55.23  #include <hypervisor-ifs/physdev.h>
    56.1 --- a/xen/common/rbtree.c	Tue Mar 23 09:33:07 2004 +0000
    56.2 +++ b/xen/common/rbtree.c	Tue Mar 23 09:48:06 2004 +0000
    56.3 @@ -19,7 +19,7 @@
    56.4    linux/lib/rbtree.c
    56.5  */
    56.6  
    56.7 -#include <xeno/rbtree.h>
    56.8 +#include <xen/rbtree.h>
    56.9  
   56.10  static void __rb_rotate_left(rb_node_t * node, rb_root_t * root)
   56.11  {
    57.1 --- a/xen/common/resource.c	Tue Mar 23 09:33:07 2004 +0000
    57.2 +++ b/xen/common/resource.c	Tue Mar 23 09:48:06 2004 +0000
    57.3 @@ -7,14 +7,14 @@
    57.4   * Arbitrary resource management.
    57.5   */
    57.6  
    57.7 -#include <xeno/config.h>
    57.8 -#include <xeno/lib.h>
    57.9 -#include <xeno/sched.h>
   57.10 -#include <xeno/errno.h>
   57.11 -#include <xeno/ioport.h>
   57.12 -#include <xeno/init.h>
   57.13 -#include <xeno/slab.h>
   57.14 -#include <xeno/spinlock.h>
   57.15 +#include <xen/config.h>
   57.16 +#include <xen/lib.h>
   57.17 +#include <xen/sched.h>
   57.18 +#include <xen/errno.h>
   57.19 +#include <xen/ioport.h>
   57.20 +#include <xen/init.h>
   57.21 +#include <xen/slab.h>
   57.22 +#include <xen/spinlock.h>
   57.23  #include <asm/io.h>
   57.24  
   57.25  struct resource ioport_resource = { "PCI IO", 0x0000, IO_SPACE_LIMIT, IORESOURCE_IO };
    58.1 --- a/xen/common/sched_bvt.c	Tue Mar 23 09:33:07 2004 +0000
    58.2 +++ b/xen/common/sched_bvt.c	Tue Mar 23 09:48:06 2004 +0000
    58.3 @@ -14,19 +14,19 @@
    58.4   *              (see Duda & Cheriton SOSP'99)
    58.5   */
    58.6  
    58.7 -#include <xeno/config.h>
    58.8 -#include <xeno/init.h>
    58.9 -#include <xeno/lib.h>
   58.10 -#include <xeno/sched.h>
   58.11 -#include <xeno/delay.h>
   58.12 -#include <xeno/event.h>
   58.13 -#include <xeno/time.h>
   58.14 -#include <xeno/ac_timer.h>
   58.15 -#include <xeno/interrupt.h>
   58.16 -#include <xeno/timer.h>
   58.17 -#include <xeno/perfc.h>
   58.18 -#include <xeno/sched-if.h>
   58.19 -#include <xeno/slab.h>
   58.20 +#include <xen/config.h>
   58.21 +#include <xen/init.h>
   58.22 +#include <xen/lib.h>
   58.23 +#include <xen/sched.h>
   58.24 +#include <xen/delay.h>
   58.25 +#include <xen/event.h>
   58.26 +#include <xen/time.h>
   58.27 +#include <xen/ac_timer.h>
   58.28 +#include <xen/interrupt.h>
   58.29 +#include <xen/timer.h>
   58.30 +#include <xen/perfc.h>
   58.31 +#include <xen/sched-if.h>
   58.32 +#include <xen/slab.h>
   58.33  
   58.34  /* all per-domain BVT-specific scheduling info is stored here */
   58.35  struct bvt_dom_info
    59.1 --- a/xen/common/sched_rrobin.c	Tue Mar 23 09:33:07 2004 +0000
    59.2 +++ b/xen/common/sched_rrobin.c	Tue Mar 23 09:48:06 2004 +0000
    59.3 @@ -4,11 +4,11 @@
    59.4   * by Mark Williamson (C) 2004 Intel Research Cambridge
    59.5   */
    59.6  
    59.7 -#include <xeno/sched.h>
    59.8 -#include <xeno/sched-if.h>
    59.9 +#include <xen/sched.h>
   59.10 +#include <xen/sched-if.h>
   59.11  #include <hypervisor-ifs/sched_ctl.h>
   59.12 -#include <xeno/ac_timer.h>
   59.13 -#include <xeno/time.h>
   59.14 +#include <xen/ac_timer.h>
   59.15 +#include <xen/time.h>
   59.16  
   59.17  static s_time_t rr_slice = MILLISECS(10);
   59.18  
    60.1 --- a/xen/common/schedule.c	Tue Mar 23 09:33:07 2004 +0000
    60.2 +++ b/xen/common/schedule.c	Tue Mar 23 09:48:06 2004 +0000
    60.3 @@ -14,20 +14,20 @@
    60.4   *
    60.5   */
    60.6  
    60.7 -#include <xeno/config.h>
    60.8 -#include <xeno/init.h>
    60.9 -#include <xeno/lib.h>
   60.10 -#include <xeno/sched.h>
   60.11 -#include <xeno/delay.h>
   60.12 -#include <xeno/event.h>
   60.13 -#include <xeno/time.h>
   60.14 -#include <xeno/ac_timer.h>
   60.15 -#include <xeno/interrupt.h>
   60.16 -#include <xeno/timer.h>
   60.17 -#include <xeno/perfc.h>
   60.18 -#include <xeno/sched-if.h>
   60.19 +#include <xen/config.h>
   60.20 +#include <xen/init.h>
   60.21 +#include <xen/lib.h>
   60.22 +#include <xen/sched.h>
   60.23 +#include <xen/delay.h>
   60.24 +#include <xen/event.h>
   60.25 +#include <xen/time.h>
   60.26 +#include <xen/ac_timer.h>
   60.27 +#include <xen/interrupt.h>
   60.28 +#include <xen/timer.h>
   60.29 +#include <xen/perfc.h>
   60.30 +#include <xen/sched-if.h>
   60.31  #include <hypervisor-ifs/sched_ctl.h>
   60.32 -#include <xeno/trace.h>
   60.33 +#include <xen/trace.h>
   60.34  
   60.35  /*#define WAKEUP_HISTO*/
   60.36  /*#define BLOCKTIME_HISTO*/
    61.1 --- a/xen/common/slab.c	Tue Mar 23 09:33:07 2004 +0000
    61.2 +++ b/xen/common/slab.c	Tue Mar 23 09:48:06 2004 +0000
    61.3 @@ -79,16 +79,16 @@
    61.4   * FORCED_DEBUG	- 1 enables SLAB_RED_ZONE and SLAB_POISON (if possible)
    61.5   */
    61.6  
    61.7 -#include <xeno/config.h>
    61.8 -#include <xeno/init.h>
    61.9 -#include <xeno/types.h>
   61.10 -#include <xeno/lib.h>
   61.11 -#include <xeno/slab.h>
   61.12 -#include <xeno/list.h>
   61.13 -#include <xeno/spinlock.h>
   61.14 -#include <xeno/errno.h>
   61.15 -#include <xeno/smp.h>
   61.16 -#include <xeno/sched.h>
   61.17 +#include <xen/config.h>
   61.18 +#include <xen/init.h>
   61.19 +#include <xen/types.h>
   61.20 +#include <xen/lib.h>
   61.21 +#include <xen/slab.h>
   61.22 +#include <xen/list.h>
   61.23 +#include <xen/spinlock.h>
   61.24 +#include <xen/errno.h>
   61.25 +#include <xen/smp.h>
   61.26 +#include <xen/sched.h>
   61.27  
   61.28  
   61.29  #ifdef CONFIG_DEBUG_SLAB
    62.1 --- a/xen/common/softirq.c	Tue Mar 23 09:33:07 2004 +0000
    62.2 +++ b/xen/common/softirq.c	Tue Mar 23 09:48:06 2004 +0000
    62.3 @@ -10,12 +10,12 @@
    62.4   * Copyright (C) 1992 Linus Torvalds
    62.5   */
    62.6  
    62.7 -#include <xeno/config.h>
    62.8 -#include <xeno/mm.h>
    62.9 -#include <xeno/sched.h>
   62.10 -#include <xeno/interrupt.h>
   62.11 -#include <xeno/init.h>
   62.12 -#include <xeno/tqueue.h>
   62.13 +#include <xen/config.h>
   62.14 +#include <xen/mm.h>
   62.15 +#include <xen/sched.h>
   62.16 +#include <xen/interrupt.h>
   62.17 +#include <xen/init.h>
   62.18 +#include <xen/tqueue.h>
   62.19  
   62.20  irq_cpustat_t irq_stat[NR_CPUS];
   62.21  
    63.1 --- a/xen/common/string.c	Tue Mar 23 09:33:07 2004 +0000
    63.2 +++ b/xen/common/string.c	Tue Mar 23 09:48:06 2004 +0000
    63.3 @@ -15,9 +15,9 @@
    63.4   *    reentrant and should be faster). Use only strsep() in new code, please.
    63.5   */
    63.6   
    63.7 -#include <xeno/types.h>
    63.8 -#include <xeno/string.h>
    63.9 -#include <xeno/ctype.h>
   63.10 +#include <xen/types.h>
   63.11 +#include <xen/string.h>
   63.12 +#include <xen/ctype.h>
   63.13  
   63.14  #ifndef __HAVE_ARCH_STRNICMP
   63.15  /**
    64.1 --- a/xen/common/timer.c	Tue Mar 23 09:33:07 2004 +0000
    64.2 +++ b/xen/common/timer.c	Tue Mar 23 09:48:06 2004 +0000
    64.3 @@ -15,16 +15,16 @@
    64.4   *  1999-03-10  Improved NTP compatibility by Ulrich Windl
    64.5   */
    64.6  
    64.7 -#include <xeno/config.h>
    64.8 -#include <xeno/mm.h>
    64.9 -#include <xeno/time.h>
   64.10 -#include <xeno/timer.h>
   64.11 -#include <xeno/timex.h>
   64.12 -#include <xeno/tqueue.h>
   64.13 -#include <xeno/delay.h>
   64.14 -#include <xeno/interrupt.h>
   64.15 +#include <xen/config.h>
   64.16 +#include <xen/mm.h>
   64.17 +#include <xen/time.h>
   64.18 +#include <xen/timer.h>
   64.19 +#include <xen/timex.h>
   64.20 +#include <xen/tqueue.h>
   64.21 +#include <xen/delay.h>
   64.22 +#include <xen/interrupt.h>
   64.23  
   64.24 -#include <xeno/event.h>
   64.25 +#include <xen/event.h>
   64.26  
   64.27  #include <asm/uaccess.h>
   64.28  
    65.1 --- a/xen/common/trace.c	Tue Mar 23 09:33:07 2004 +0000
    65.2 +++ b/xen/common/trace.c	Tue Mar 23 09:48:06 2004 +0000
    65.3 @@ -12,24 +12,24 @@
    65.4   * generated on UP / SMP machines.  Each trace entry is timestamped so that
    65.5   * it's possible to reconstruct a chronological record of trace events.
    65.6   *
    65.7 - * See also include/xeno/trace.h and the dom0 op in
    65.8 + * See also include/xen/trace.h and the dom0 op in
    65.9   * include/hypervisor-ifs/dom0_ops.h
   65.10   */
   65.11  
   65.12 -#include <xeno/config.h>
   65.13 +#include <xen/config.h>
   65.14  
   65.15  #ifdef TRACE_BUFFER
   65.16  
   65.17  #include <asm/timex.h>
   65.18  #include <asm/types.h>
   65.19  #include <asm/io.h>
   65.20 -#include <xeno/lib.h>
   65.21 -#include <xeno/sched.h>
   65.22 -#include <xeno/slab.h>
   65.23 -#include <xeno/smp.h>
   65.24 -#include <xeno/spinlock.h>
   65.25 -#include <xeno/trace.h>
   65.26 -#include <xeno/errno.h>
   65.27 +#include <xen/lib.h>
   65.28 +#include <xen/sched.h>
   65.29 +#include <xen/slab.h>
   65.30 +#include <xen/smp.h>
   65.31 +#include <xen/spinlock.h>
   65.32 +#include <xen/trace.h>
   65.33 +#include <xen/errno.h>
   65.34  #include <asm/atomic.h>
   65.35  #include <hypervisor-ifs/dom0_ops.h>
   65.36  
   65.37 @@ -44,7 +44,7 @@ int tb_init_done = 0;
   65.38   *
   65.39   * This function is called at start of day in order to initialise the per-cpu
   65.40   * trace buffers.  The trace buffers are then available for debugging use, via
   65.41 - * the %TRACE_xD macros exported in <xeno/trace.h>.
   65.42 + * the %TRACE_xD macros exported in <xen/trace.h>.
   65.43   */
   65.44  void init_trace_bufs(void)
   65.45  {
    66.1 --- a/xen/common/vsprintf.c	Tue Mar 23 09:33:07 2004 +0000
    66.2 +++ b/xen/common/vsprintf.c	Tue Mar 23 09:48:06 2004 +0000
    66.3 @@ -15,8 +15,8 @@
    66.4   */
    66.5  
    66.6  #include <stdarg.h>
    66.7 -#include <xeno/ctype.h>
    66.8 -#include <xeno/lib.h>
    66.9 +#include <xen/ctype.h>
   66.10 +#include <xen/lib.h>
   66.11  
   66.12  /**
   66.13   * simple_strtoul - convert a string to an unsigned long
    67.1 --- a/xen/drivers/block/blkpg.c	Tue Mar 23 09:33:07 2004 +0000
    67.2 +++ b/xen/drivers/block/blkpg.c	Tue Mar 23 09:48:06 2004 +0000
    67.3 @@ -28,16 +28,16 @@
    67.4   * For today, only the partition stuff - aeb, 990515
    67.5   */
    67.6  
    67.7 -#include <xeno/config.h>
    67.8 -#include <xeno/types.h>
    67.9 -#include <xeno/errno.h>
   67.10 -/*#include <xeno/fs.h>	*/		/* for BLKRASET, ... */
   67.11 -#include <xeno/sched.h>		/* for capable() */
   67.12 -#include <xeno/blk.h>			/* for set_device_ro() */
   67.13 -#include <xeno/blkpg.h>
   67.14 -#include <xeno/genhd.h>
   67.15 -/*#include <xeno/swap.h>*/			/* for is_swap_partition() */
   67.16 -#include <xeno/module.h>               /* for EXPORT_SYMBOL */
   67.17 +#include <xen/config.h>
   67.18 +#include <xen/types.h>
   67.19 +#include <xen/errno.h>
   67.20 +/*#include <xen/fs.h>	*/		/* for BLKRASET, ... */
   67.21 +#include <xen/sched.h>		/* for capable() */
   67.22 +#include <xen/blk.h>			/* for set_device_ro() */
   67.23 +#include <xen/blkpg.h>
   67.24 +#include <xen/genhd.h>
   67.25 +/*#include <xen/swap.h>*/			/* for is_swap_partition() */
   67.26 +#include <xen/module.h>               /* for EXPORT_SYMBOL */
   67.27  
   67.28  #include <asm/uaccess.h>
   67.29  
    68.1 --- a/xen/drivers/block/cciss.c	Tue Mar 23 09:33:07 2004 +0000
    68.2 +++ b/xen/drivers/block/cciss.c	Tue Mar 23 09:48:06 2004 +0000
    68.3 @@ -20,27 +20,27 @@
    68.4   *
    68.5   */
    68.6  
    68.7 -#include <xeno/config.h>	/* CONFIG_PROC_FS */
    68.8 -#include <xeno/module.h>
    68.9 -#include <xeno/version.h>
   68.10 -#include <xeno/types.h>
   68.11 -#include <xeno/pci.h>
   68.12 -#include <xeno/kernel.h>
   68.13 -#include <xeno/slab.h>
   68.14 -#include <xeno/delay.h>
   68.15 -#include <xeno/major.h>
   68.16 -#include <xeno/blkpg.h>
   68.17 -#include <xeno/interrupt.h>
   68.18 -#include <xeno/timer.h>
   68.19 -#include <xeno/init.h> 
   68.20 -#include <xeno/hdreg.h>
   68.21 -#include <xeno/spinlock.h>
   68.22 +#include <xen/config.h>	/* CONFIG_PROC_FS */
   68.23 +#include <xen/module.h>
   68.24 +#include <xen/version.h>
   68.25 +#include <xen/types.h>
   68.26 +#include <xen/pci.h>
   68.27 +#include <xen/kernel.h>
   68.28 +#include <xen/slab.h>
   68.29 +#include <xen/delay.h>
   68.30 +#include <xen/major.h>
   68.31 +#include <xen/blkpg.h>
   68.32 +#include <xen/interrupt.h>
   68.33 +#include <xen/timer.h>
   68.34 +#include <xen/init.h> 
   68.35 +#include <xen/hdreg.h>
   68.36 +#include <xen/spinlock.h>
   68.37  #include <asm/uaccess.h>
   68.38  #include <asm/io.h>
   68.39  
   68.40 -#include <xeno/blk.h>
   68.41 -#include <xeno/blkdev.h>
   68.42 -#include <xeno/genhd.h>
   68.43 +#include <xen/blk.h>
   68.44 +#include <xen/blkdev.h>
   68.45 +#include <xen/genhd.h>
   68.46  
   68.47  #include <asm/irq.h>
   68.48  #include <asm/byteorder.h>
    69.1 --- a/xen/drivers/block/cciss.h	Tue Mar 23 09:33:07 2004 +0000
    69.2 +++ b/xen/drivers/block/cciss.h	Tue Mar 23 09:48:06 2004 +0000
    69.3 @@ -1,7 +1,7 @@
    69.4  #ifndef CCISS_H
    69.5  #define CCISS_H
    69.6  
    69.7 -#include <xeno/genhd.h>
    69.8 +#include <xen/genhd.h>
    69.9  
   69.10  #include "cciss_cmd.h"
   69.11  
    70.1 --- a/xen/drivers/block/cciss_scsi.c	Tue Mar 23 09:33:07 2004 +0000
    70.2 +++ b/xen/drivers/block/cciss_scsi.c	Tue Mar 23 09:48:06 2004 +0000
    70.3 @@ -31,7 +31,7 @@
    70.4  #include "../scsi/scsi.h"
    70.5  #include "../scsi/hosts.h"
    70.6  #include <asm/atomic.h>
    70.7 -#include <xeno/timer.h>
    70.8 +#include <xen/timer.h>
    70.9  
   70.10  #include "cciss_scsi.h"
   70.11  
    71.1 --- a/xen/drivers/block/elevator.c	Tue Mar 23 09:33:07 2004 +0000
    71.2 +++ b/xen/drivers/block/elevator.c	Tue Mar 23 09:48:06 2004 +0000
    71.3 @@ -20,13 +20,13 @@
    71.4   *
    71.5   */
    71.6  
    71.7 -#include <xeno/config.h>
    71.8 -#include <xeno/types.h>
    71.9 -/*#include <xeno/fs.h>*/
   71.10 -#include <xeno/blkdev.h>
   71.11 -#include <xeno/elevator.h>
   71.12 -#include <xeno/blk.h>
   71.13 -#include <xeno/module.h>
   71.14 +#include <xen/config.h>
   71.15 +#include <xen/types.h>
   71.16 +/*#include <xen/fs.h>*/
   71.17 +#include <xen/blkdev.h>
   71.18 +#include <xen/elevator.h>
   71.19 +#include <xen/blk.h>
   71.20 +#include <xen/module.h>
   71.21  #include <asm/uaccess.h>
   71.22  
   71.23  /*
    72.1 --- a/xen/drivers/block/genhd.c	Tue Mar 23 09:33:07 2004 +0000
    72.2 +++ b/xen/drivers/block/genhd.c	Tue Mar 23 09:48:06 2004 +0000
    72.3 @@ -14,14 +14,14 @@
    72.4   * TODO:  rip out the remaining init crap from this file  --hch
    72.5   */
    72.6  
    72.7 -#include <xeno/config.h>
    72.8 -#include <xeno/module.h>
    72.9 -/*#include <xeno/fs.h>*/
   72.10 -#include <xeno/genhd.h>
   72.11 -#include <xeno/lib.h>
   72.12 -#include <xeno/blk.h>
   72.13 -#include <xeno/init.h>
   72.14 -#include <xeno/spinlock.h>
   72.15 +#include <xen/config.h>
   72.16 +#include <xen/module.h>
   72.17 +/*#include <xen/fs.h>*/
   72.18 +#include <xen/genhd.h>
   72.19 +#include <xen/lib.h>
   72.20 +#include <xen/blk.h>
   72.21 +#include <xen/init.h>
   72.22 +#include <xen/spinlock.h>
   72.23  
   72.24  
   72.25  static rwlock_t gendisk_lock;
    73.1 --- a/xen/drivers/block/ll_rw_blk.c	Tue Mar 23 09:33:07 2004 +0000
    73.2 +++ b/xen/drivers/block/ll_rw_blk.c	Tue Mar 23 09:48:06 2004 +0000
    73.3 @@ -10,18 +10,18 @@
    73.4  /*
    73.5   * This handles all read/write requests to block devices
    73.6   */
    73.7 -#include <xeno/config.h>
    73.8 -#include <xeno/types.h>
    73.9 -#include <xeno/lib.h>
   73.10 -#include <xeno/sched.h>
   73.11 -#include <xeno/errno.h>
   73.12 -#include <xeno/mm.h>
   73.13 -#include <xeno/init.h>
   73.14 +#include <xen/config.h>
   73.15 +#include <xen/types.h>
   73.16 +#include <xen/lib.h>
   73.17 +#include <xen/sched.h>
   73.18 +#include <xen/errno.h>
   73.19 +#include <xen/mm.h>
   73.20 +#include <xen/init.h>
   73.21  #include <asm/system.h>
   73.22  #include <asm/io.h>
   73.23 -#include <xeno/blk.h>
   73.24 -#include <xeno/slab.h>
   73.25 -#include <xeno/module.h>
   73.26 +#include <xen/blk.h>
   73.27 +#include <xen/slab.h>
   73.28 +#include <xen/module.h>
   73.29  
   73.30  /* This will die as all synchronous stuff is coming to an end */
   73.31  #if 0 
    74.1 --- a/xen/drivers/block/xen_block.c	Tue Mar 23 09:33:07 2004 +0000
    74.2 +++ b/xen/drivers/block/xen_block.c	Tue Mar 23 09:48:06 2004 +0000
    74.3 @@ -4,21 +4,21 @@
    74.4   * process incoming block io requests from guestos's.
    74.5   */
    74.6  
    74.7 -#include <xeno/config.h>
    74.8 -#include <xeno/types.h>
    74.9 -#include <xeno/lib.h>
   74.10 -#include <xeno/sched.h>
   74.11 -#include <xeno/blkdev.h>
   74.12 -#include <xeno/event.h>
   74.13 +#include <xen/config.h>
   74.14 +#include <xen/types.h>
   74.15 +#include <xen/lib.h>
   74.16 +#include <xen/sched.h>
   74.17 +#include <xen/blkdev.h>
   74.18 +#include <xen/event.h>
   74.19  #include <hypervisor-ifs/block.h>
   74.20  #include <hypervisor-ifs/hypervisor-if.h>
   74.21  #include <asm-i386/io.h>
   74.22  #include <asm/domain_page.h>
   74.23 -#include <xeno/spinlock.h>
   74.24 -#include <xeno/keyhandler.h>
   74.25 -#include <xeno/interrupt.h>
   74.26 -#include <xeno/vbd.h>
   74.27 -#include <xeno/slab.h>
   74.28 +#include <xen/spinlock.h>
   74.29 +#include <xen/keyhandler.h>
   74.30 +#include <xen/interrupt.h>
   74.31 +#include <xen/vbd.h>
   74.32 +#include <xen/slab.h>
   74.33  
   74.34  /*
   74.35   * These are rather arbitrary. They are fairly large because adjacent requests
    75.1 --- a/xen/drivers/block/xen_vbd.c	Tue Mar 23 09:33:07 2004 +0000
    75.2 +++ b/xen/drivers/block/xen_vbd.c	Tue Mar 23 09:48:06 2004 +0000
    75.3 @@ -6,20 +6,20 @@
    75.4   * Copyright (c) 2003-2004, Keir Fraser & Steve Hand
    75.5   */
    75.6  
    75.7 -#include <xeno/config.h>
    75.8 -#include <xeno/types.h>
    75.9 -#include <xeno/lib.h>
   75.10 +#include <xen/config.h>
   75.11 +#include <xen/types.h>
   75.12 +#include <xen/lib.h>
   75.13  #include <asm/io.h>
   75.14 -#include <xeno/slab.h>
   75.15 -#include <xeno/sched.h>
   75.16 -#include <xeno/vbd.h>
   75.17 -#include <xeno/blkdev.h>
   75.18 -#include <xeno/keyhandler.h>
   75.19 +#include <xen/slab.h>
   75.20 +#include <xen/sched.h>
   75.21 +#include <xen/vbd.h>
   75.22 +#include <xen/blkdev.h>
   75.23 +#include <xen/keyhandler.h>
   75.24  #include <asm/current.h>
   75.25  #include <asm/domain_page.h>
   75.26  
   75.27  #include <hypervisor-ifs/hypervisor-if.h>
   75.28 -#include <xeno/event.h>
   75.29 +#include <xen/event.h>
   75.30  
   75.31  long __vbd_create(struct task_struct *p,
   75.32                    unsigned short vdevice,
    76.1 --- a/xen/drivers/cdrom/cdrom.c	Tue Mar 23 09:33:07 2004 +0000
    76.2 +++ b/xen/drivers/cdrom/cdrom.c	Tue Mar 23 09:48:06 2004 +0000
    76.3 @@ -251,19 +251,19 @@ 2.50 Oct 19, 1998 - Jens Axboe <axboe@im
    76.4  /* #define ERRLOGMASK (CD_WARNING|CD_OPEN|CD_COUNT_TRACKS|CD_CLOSE) */
    76.5  /* #define ERRLOGMASK (CD_WARNING|CD_REG_UNREG|CD_DO_IOCTL|CD_OPEN|CD_CLOSE|CD_COUNT_TRACKS) */
    76.6  
    76.7 -#include <xeno/config.h>
    76.8 -#include <xeno/module.h>
    76.9 -/* #include <xeno/fs.h> */
   76.10 -#include <xeno/major.h>
   76.11 -#include <xeno/types.h>
   76.12 -#include <xeno/errno.h>
   76.13 -#include <xeno/kernel.h>
   76.14 -#include <xeno/mm.h>
   76.15 -#include <xeno/slab.h> 
   76.16 -#include <xeno/cdrom.h>
   76.17 -/* #include <xeno/sysctl.h> */
   76.18 -/* #include <xeno/proc_fs.h> */
   76.19 -#include <xeno/init.h>
   76.20 +#include <xen/config.h>
   76.21 +#include <xen/module.h>
   76.22 +/* #include <xen/fs.h> */
   76.23 +#include <xen/major.h>
   76.24 +#include <xen/types.h>
   76.25 +#include <xen/errno.h>
   76.26 +#include <xen/kernel.h>
   76.27 +#include <xen/mm.h>
   76.28 +#include <xen/slab.h> 
   76.29 +#include <xen/cdrom.h>
   76.30 +/* #include <xen/sysctl.h> */
   76.31 +/* #include <xen/proc_fs.h> */
   76.32 +#include <xen/init.h>
   76.33  
   76.34  /* #include <asm/fcntl.h> */
   76.35  /* #include <asm/segment.h> */
    77.1 --- a/xen/drivers/char/console.c	Tue Mar 23 09:33:07 2004 +0000
    77.2 +++ b/xen/drivers/char/console.c	Tue Mar 23 09:48:06 2004 +0000
    77.3 @@ -7,14 +7,14 @@
    77.4   */
    77.5  
    77.6  #include <stdarg.h>
    77.7 -#include <xeno/config.h>
    77.8 -#include <xeno/lib.h>
    77.9 -#include <xeno/errno.h>
   77.10 -#include <xeno/event.h>
   77.11 -#include <xeno/spinlock.h>
   77.12 -#include <xeno/console.h>
   77.13 -#include <xeno/serial.h>
   77.14 -#include <xeno/keyhandler.h>
   77.15 +#include <xen/config.h>
   77.16 +#include <xen/lib.h>
   77.17 +#include <xen/errno.h>
   77.18 +#include <xen/event.h>
   77.19 +#include <xen/spinlock.h>
   77.20 +#include <xen/console.h>
   77.21 +#include <xen/serial.h>
   77.22 +#include <xen/keyhandler.h>
   77.23  #include <asm/uaccess.h>
   77.24  
   77.25  static int xpos, ypos;
    78.1 --- a/xen/drivers/char/keyboard.c	Tue Mar 23 09:33:07 2004 +0000
    78.2 +++ b/xen/drivers/char/keyboard.c	Tue Mar 23 09:48:06 2004 +0000
    78.3 @@ -8,13 +8,13 @@
    78.4  
    78.5  #include <asm-i386/io.h>
    78.6  #include <asm-i386/irq.h>
    78.7 -#include <xeno/sched.h>
    78.8 -#include <xeno/keyhandler.h>  
    78.9 +#include <xen/sched.h>
   78.10 +#include <xen/keyhandler.h>  
   78.11  #include <hypervisor-ifs/kbd.h>
   78.12 -#include <xeno/event.h>
   78.13 -#include <xeno/console.h>
   78.14 +#include <xen/event.h>
   78.15 +#include <xen/console.h>
   78.16  
   78.17 -/* Hash-defines torn from <xeno/pc_keyb.h> and <asm/keyboard.h> */
   78.18 +/* Hash-defines torn from <xen/pc_keyb.h> and <asm/keyboard.h> */
   78.19  
   78.20  #define KBD_STATUS_REG	     0x64 /* Status register (R) */
   78.21  #define KBD_CNTL_REG	     0x64 /* Controller command register (W) */
    79.1 --- a/xen/drivers/char/serial.c	Tue Mar 23 09:33:07 2004 +0000
    79.2 +++ b/xen/drivers/char/serial.c	Tue Mar 23 09:48:06 2004 +0000
    79.3 @@ -9,11 +9,11 @@
    79.4   */
    79.5  
    79.6  #include <asm-i386/io.h>
    79.7 -#include <xeno/sched.h>
    79.8 -#include <xeno/keyhandler.h> 
    79.9 -#include <xeno/reboot.h>
   79.10 -#include <xeno/irq.h>
   79.11 -#include <xeno/serial.h>
   79.12 +#include <xen/sched.h>
   79.13 +#include <xen/keyhandler.h> 
   79.14 +#include <xen/reboot.h>
   79.15 +#include <xen/irq.h>
   79.16 +#include <xen/serial.h>
   79.17  #include <asm/pdb.h>
   79.18  
   79.19  /* Register offsets */
    80.1 --- a/xen/drivers/ide/ide-cd.c	Tue Mar 23 09:33:07 2004 +0000
    80.2 +++ b/xen/drivers/ide/ide-cd.c	Tue Mar 23 09:48:06 2004 +0000
    80.3 @@ -296,18 +296,18 @@
    80.4   
    80.5  #define IDECD_VERSION "4.59"
    80.6  
    80.7 -#include <xeno/config.h>
    80.8 -#include <xeno/module.h>
    80.9 -#include <xeno/types.h>
   80.10 -#include <xeno/kernel.h>
   80.11 -#include <xeno/delay.h>
   80.12 -#include <xeno/timer.h>
   80.13 -#include <xeno/slab.h>
   80.14 -#include <xeno/interrupt.h>
   80.15 -#include <xeno/errno.h>
   80.16 -#include <xeno/cdrom.h>
   80.17 -#include <xeno/ide.h>
   80.18 -// #include <xeno/completion.h>
   80.19 +#include <xen/config.h>
   80.20 +#include <xen/module.h>
   80.21 +#include <xen/types.h>
   80.22 +#include <xen/kernel.h>
   80.23 +#include <xen/delay.h>
   80.24 +#include <xen/timer.h>
   80.25 +#include <xen/slab.h>
   80.26 +#include <xen/interrupt.h>
   80.27 +#include <xen/errno.h>
   80.28 +#include <xen/cdrom.h>
   80.29 +#include <xen/ide.h>
   80.30 +// #include <xen/completion.h>
   80.31  
   80.32  #include <asm/irq.h>
   80.33  #include <asm/io.h>
    81.1 --- a/xen/drivers/ide/ide-cd.h	Tue Mar 23 09:33:07 2004 +0000
    81.2 +++ b/xen/drivers/ide/ide-cd.h	Tue Mar 23 09:48:06 2004 +0000
    81.3 @@ -7,7 +7,7 @@
    81.4  #ifndef _IDE_CD_H
    81.5  #define _IDE_CD_H
    81.6  
    81.7 -#include <xeno/cdrom.h>
    81.8 +#include <xen/cdrom.h>
    81.9  #include <asm/byteorder.h>
   81.10  
   81.11  /* Turn this on to have the driver print out the meanings of the
    82.1 --- a/xen/drivers/ide/ide-disk.c	Tue Mar 23 09:33:07 2004 +0000
    82.2 +++ b/xen/drivers/ide/ide-disk.c	Tue Mar 23 09:48:06 2004 +0000
    82.3 @@ -35,19 +35,19 @@
    82.4  
    82.5  #undef REALLY_SLOW_IO		/* most systems can safely undef this */
    82.6  
    82.7 -#include <xeno/config.h>
    82.8 -#include <xeno/module.h>
    82.9 -#include <xeno/types.h>
   82.10 -#include <xeno/lib.h>
   82.11 -#include <xeno/timer.h>
   82.12 -#include <xeno/mm.h>
   82.13 -#include <xeno/interrupt.h>
   82.14 -#include <xeno/major.h>
   82.15 -#include <xeno/errno.h>
   82.16 -#include <xeno/genhd.h>
   82.17 -#include <xeno/slab.h>
   82.18 -#include <xeno/delay.h>
   82.19 -#include <xeno/ide.h>
   82.20 +#include <xen/config.h>
   82.21 +#include <xen/module.h>
   82.22 +#include <xen/types.h>
   82.23 +#include <xen/lib.h>
   82.24 +#include <xen/timer.h>
   82.25 +#include <xen/mm.h>
   82.26 +#include <xen/interrupt.h>
   82.27 +#include <xen/major.h>
   82.28 +#include <xen/errno.h>
   82.29 +#include <xen/genhd.h>
   82.30 +#include <xen/slab.h>
   82.31 +#include <xen/delay.h>
   82.32 +#include <xen/ide.h>
   82.33  
   82.34  #include <asm/byteorder.h>
   82.35  #include <asm/irq.h>
    83.1 --- a/xen/drivers/ide/ide-dma.c	Tue Mar 23 09:33:07 2004 +0000
    83.2 +++ b/xen/drivers/ide/ide-dma.c	Tue Mar 23 09:48:06 2004 +0000
    83.3 @@ -77,15 +77,15 @@
    83.4   *
    83.5   */
    83.6  
    83.7 -#include <xeno/config.h>
    83.8 -#include <xeno/types.h>
    83.9 -#include <xeno/lib.h>
   83.10 -#include <xeno/timer.h>
   83.11 -#include <xeno/mm.h>
   83.12 -#include <xeno/interrupt.h>
   83.13 -#include <xeno/pci.h>
   83.14 -#include <xeno/init.h>
   83.15 -#include <xeno/ide.h>
   83.16 +#include <xen/config.h>
   83.17 +#include <xen/types.h>
   83.18 +#include <xen/lib.h>
   83.19 +#include <xen/timer.h>
   83.20 +#include <xen/mm.h>
   83.21 +#include <xen/interrupt.h>
   83.22 +#include <xen/pci.h>
   83.23 +#include <xen/init.h>
   83.24 +#include <xen/ide.h>
   83.25  
   83.26  #include <asm/byteorder.h>
   83.27  #include <asm/io.h>
    84.1 --- a/xen/drivers/ide/ide-features.c	Tue Mar 23 09:33:07 2004 +0000
    84.2 +++ b/xen/drivers/ide/ide-features.c	Tue Mar 23 09:48:06 2004 +0000
    84.3 @@ -14,23 +14,23 @@
    84.4   *  May be copied or modified under the terms of the GNU General Public License
    84.5   */
    84.6  
    84.7 -#include <xeno/config.h>
    84.8 +#include <xen/config.h>
    84.9  #define __NO_VERSION__
   84.10 -#include <xeno/module.h>
   84.11 -#include <xeno/types.h>
   84.12 -#include <xeno/lib.h>
   84.13 -#include <xeno/timer.h>
   84.14 -#include <xeno/mm.h>
   84.15 -#include <xeno/interrupt.h>
   84.16 -#include <xeno/major.h>
   84.17 -#include <xeno/errno.h>
   84.18 -#include <xeno/genhd.h>
   84.19 -#include <xeno/blkpg.h>
   84.20 -#include <xeno/slab.h>
   84.21 -#include <xeno/pci.h>
   84.22 -#include <xeno/delay.h>
   84.23 -#include <xeno/hdreg.h>
   84.24 -#include <xeno/ide.h>
   84.25 +#include <xen/module.h>
   84.26 +#include <xen/types.h>
   84.27 +#include <xen/lib.h>
   84.28 +#include <xen/timer.h>
   84.29 +#include <xen/mm.h>
   84.30 +#include <xen/interrupt.h>
   84.31 +#include <xen/major.h>
   84.32 +#include <xen/errno.h>
   84.33 +#include <xen/genhd.h>
   84.34 +#include <xen/blkpg.h>
   84.35 +#include <xen/slab.h>
   84.36 +#include <xen/pci.h>
   84.37 +#include <xen/delay.h>
   84.38 +#include <xen/hdreg.h>
   84.39 +#include <xen/ide.h>
   84.40  
   84.41  #include <asm/byteorder.h>
   84.42  #include <asm/irq.h>
    85.1 --- a/xen/drivers/ide/ide-geometry.c	Tue Mar 23 09:33:07 2004 +0000
    85.2 +++ b/xen/drivers/ide/ide-geometry.c	Tue Mar 23 09:48:06 2004 +0000
    85.3 @@ -1,8 +1,8 @@
    85.4  /*
    85.5   * linux/drivers/ide/ide-geometry.c
    85.6   */
    85.7 -#include <xeno/config.h>
    85.8 -#include <xeno/ide.h>
    85.9 +#include <xen/config.h>
   85.10 +#include <xen/ide.h>
   85.11  #include <asm/mc146818rtc.h>
   85.12  #include <asm/io.h>
   85.13  
    86.1 --- a/xen/drivers/ide/ide-pci.c	Tue Mar 23 09:33:07 2004 +0000
    86.2 +++ b/xen/drivers/ide/ide-pci.c	Tue Mar 23 09:48:06 2004 +0000
    86.3 @@ -12,15 +12,15 @@
    86.4   *  configuration of all PCI IDE interfaces present in a system.  
    86.5   */
    86.6  
    86.7 -#include <xeno/config.h>
    86.8 -#include <xeno/types.h>
    86.9 -#include <xeno/kernel.h>
   86.10 -#include <xeno/timer.h>
   86.11 -#include <xeno/mm.h>
   86.12 -#include <xeno/interrupt.h>
   86.13 -#include <xeno/pci.h>
   86.14 -#include <xeno/init.h>
   86.15 -#include <xeno/ide.h>
   86.16 +#include <xen/config.h>
   86.17 +#include <xen/types.h>
   86.18 +#include <xen/kernel.h>
   86.19 +#include <xen/timer.h>
   86.20 +#include <xen/mm.h>
   86.21 +#include <xen/interrupt.h>
   86.22 +#include <xen/pci.h>
   86.23 +#include <xen/init.h>
   86.24 +#include <xen/ide.h>
   86.25  
   86.26  #include <asm/io.h>
   86.27  #include <asm/irq.h>
    87.1 --- a/xen/drivers/ide/ide-probe.c	Tue Mar 23 09:33:07 2004 +0000
    87.2 +++ b/xen/drivers/ide/ide-probe.c	Tue Mar 23 09:48:06 2004 +0000
    87.3 @@ -31,20 +31,20 @@
    87.4  
    87.5  #undef REALLY_SLOW_IO		/* most systems can safely undef this */
    87.6  
    87.7 -#include <xeno/config.h>
    87.8 -#include <xeno/module.h>
    87.9 -#include <xeno/types.h>
   87.10 -#include <xeno/lib.h>
   87.11 -#include <xeno/timer.h>
   87.12 -#include <xeno/mm.h>
   87.13 -#include <xeno/interrupt.h>
   87.14 -#include <xeno/major.h>
   87.15 -#include <xeno/errno.h>
   87.16 -#include <xeno/genhd.h>
   87.17 -#include <xeno/slab.h>
   87.18 -#include <xeno/delay.h>
   87.19 -#include <xeno/ide.h>
   87.20 -#include <xeno/spinlock.h>
   87.21 +#include <xen/config.h>
   87.22 +#include <xen/module.h>
   87.23 +#include <xen/types.h>
   87.24 +#include <xen/lib.h>
   87.25 +#include <xen/timer.h>
   87.26 +#include <xen/mm.h>
   87.27 +#include <xen/interrupt.h>
   87.28 +#include <xen/major.h>
   87.29 +#include <xen/errno.h>
   87.30 +#include <xen/genhd.h>
   87.31 +#include <xen/slab.h>
   87.32 +#include <xen/delay.h>
   87.33 +#include <xen/ide.h>
   87.34 +#include <xen/spinlock.h>
   87.35  
   87.36  #include <asm/byteorder.h>
   87.37  #include <asm/irq.h>
    88.1 --- a/xen/drivers/ide/ide-taskfile.c	Tue Mar 23 09:33:07 2004 +0000
    88.2 +++ b/xen/drivers/ide/ide-taskfile.c	Tue Mar 23 09:48:06 2004 +0000
    88.3 @@ -9,23 +9,23 @@
    88.4   * IDE_DEBUG(__LINE__);
    88.5   */
    88.6  
    88.7 -#include <xeno/config.h>
    88.8 +#include <xen/config.h>
    88.9  #define __NO_VERSION__
   88.10 -#include <xeno/module.h>
   88.11 -#include <xeno/types.h>
   88.12 -#include <xeno/lib.h>
   88.13 -#include <xeno/timer.h>
   88.14 -#include <xeno/mm.h>
   88.15 -#include <xeno/interrupt.h>
   88.16 -#include <xeno/major.h>
   88.17 -#include <xeno/errno.h>
   88.18 -#include <xeno/genhd.h>
   88.19 -#include <xeno/blkpg.h>
   88.20 -#include <xeno/slab.h>
   88.21 -#include <xeno/pci.h>
   88.22 -#include <xeno/delay.h>
   88.23 -#include <xeno/hdreg.h>
   88.24 -#include <xeno/ide.h>
   88.25 +#include <xen/module.h>
   88.26 +#include <xen/types.h>
   88.27 +#include <xen/lib.h>
   88.28 +#include <xen/timer.h>
   88.29 +#include <xen/mm.h>
   88.30 +#include <xen/interrupt.h>
   88.31 +#include <xen/major.h>
   88.32 +#include <xen/errno.h>
   88.33 +#include <xen/genhd.h>
   88.34 +#include <xen/blkpg.h>
   88.35 +#include <xen/slab.h>
   88.36 +#include <xen/pci.h>
   88.37 +#include <xen/delay.h>
   88.38 +#include <xen/hdreg.h>
   88.39 +#include <xen/ide.h>
   88.40  
   88.41  #include <asm/domain_page.h>
   88.42  #include <asm/byteorder.h>
    89.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    89.2 +++ b/xen/drivers/ide/ide-xen.c	Tue Mar 23 09:48:06 2004 +0000
    89.3 @@ -0,0 +1,61 @@
    89.4 +#include <xen/config.h>
    89.5 +#include <xen/types.h>
    89.6 +#include <xen/lib.h>
    89.7 +#include <xen/ide.h>
    89.8 +#include <xen/vbd.h>
    89.9 +#include <asm/domain_page.h>
   89.10 +#include <asm/io.h>
   89.11 +
   89.12 +static kdev_t ide_devs[] = { 
   89.13 +    MKDEV(IDE0_MAJOR, 0), MKDEV(IDE0_MAJOR, 64),                /* hda, hdb */
   89.14 +    MKDEV(IDE1_MAJOR, 0), MKDEV(IDE1_MAJOR, 64),                /* hdc, hdd */
   89.15 +    MKDEV(IDE2_MAJOR, 0), MKDEV(IDE2_MAJOR, 64),                /* hde, hdf */
   89.16 +    MKDEV(IDE3_MAJOR, 0), MKDEV(IDE3_MAJOR, 64),                /* hdg, hdh */
   89.17 +    MKDEV(IDE4_MAJOR, 0), MKDEV(IDE4_MAJOR, 64),                /* hdi, hdj */
   89.18 +    MKDEV(IDE5_MAJOR, 0), MKDEV(IDE5_MAJOR, 64),                /* hdk, hdl */
   89.19 +    MKDEV(IDE6_MAJOR, 0), MKDEV(IDE6_MAJOR, 64),                /* hdm, hdn */
   89.20 +    MKDEV(IDE7_MAJOR, 0), MKDEV(IDE7_MAJOR, 64),                /* hdo, hdp */
   89.21 +    MKDEV(IDE8_MAJOR, 0), MKDEV(IDE8_MAJOR, 64),                /* hdq, hdr */
   89.22 +    MKDEV(IDE9_MAJOR, 0), MKDEV(IDE9_MAJOR, 64)                 /* hds, hdt */
   89.23 +};
   89.24 +
   89.25 +void ide_probe_devices(xen_disk_info_t* xdi)
   89.26 +{
   89.27 +    int i, unit;
   89.28 +    ide_drive_t *drive;
   89.29 +    xen_disk_t *xd = &xdi->disks[xdi->count];
   89.30 +
   89.31 +    for ( i = 0; i < MAX_HWIFS; i++ )
   89.32 +    {
   89.33 +	ide_hwif_t *hwif = &ide_hwifs[i];
   89.34 +	if ( !hwif->present ) continue;
   89.35 +
   89.36 +        for ( unit = 0; unit < MAX_DRIVES; unit++ )
   89.37 +        {
   89.38 +            drive = &hwif->drives[unit];
   89.39 +
   89.40 +            if ( !drive->present )
   89.41 +                continue;
   89.42 +
   89.43 +	    if ( xdi->count == xdi->max )
   89.44 +                BUG();
   89.45 +
   89.46 +	    /* We export 'raw' linux device numbers to domain 0. */
   89.47 +	    xd->device = ide_devs[(i * MAX_DRIVES) + unit]; 
   89.48 +
   89.49 +	    /*
   89.50 +	     * NB: we use the ide 'media' field (ide_disk, ide_cdrom, etc) as 
   89.51 +	     * our 'type' field (XD_TYPE_DISK, XD_TYPE_CDROM, etc). Hence must 
   89.52 +	     * ensure these are kept in sync.
   89.53 +	     */
   89.54 +	    if ( (xd->info = drive->media) == XD_TYPE_CDROM ) 
   89.55 +		xd->info |= XD_FLAG_RO; 
   89.56 +
   89.57 +	    xd->capacity = current_capacity(drive);
   89.58 +	    xd->domain   = 0;
   89.59 +		
   89.60 +            xdi->count++;
   89.61 +            xd++;
   89.62 +        }
   89.63 +    }
   89.64 +}
    90.1 --- a/xen/drivers/ide/ide-xeno.c	Tue Mar 23 09:33:07 2004 +0000
    90.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    90.3 @@ -1,61 +0,0 @@
    90.4 -#include <xeno/config.h>
    90.5 -#include <xeno/types.h>
    90.6 -#include <xeno/lib.h>
    90.7 -#include <xeno/ide.h>
    90.8 -#include <xeno/vbd.h>
    90.9 -#include <asm/domain_page.h>
   90.10 -#include <asm/io.h>
   90.11 -
   90.12 -static kdev_t ide_devs[] = { 
   90.13 -    MKDEV(IDE0_MAJOR, 0), MKDEV(IDE0_MAJOR, 64),                /* hda, hdb */
   90.14 -    MKDEV(IDE1_MAJOR, 0), MKDEV(IDE1_MAJOR, 64),                /* hdc, hdd */
   90.15 -    MKDEV(IDE2_MAJOR, 0), MKDEV(IDE2_MAJOR, 64),                /* hde, hdf */
   90.16 -    MKDEV(IDE3_MAJOR, 0), MKDEV(IDE3_MAJOR, 64),                /* hdg, hdh */
   90.17 -    MKDEV(IDE4_MAJOR, 0), MKDEV(IDE4_MAJOR, 64),                /* hdi, hdj */
   90.18 -    MKDEV(IDE5_MAJOR, 0), MKDEV(IDE5_MAJOR, 64),                /* hdk, hdl */
   90.19 -    MKDEV(IDE6_MAJOR, 0), MKDEV(IDE6_MAJOR, 64),                /* hdm, hdn */
   90.20 -    MKDEV(IDE7_MAJOR, 0), MKDEV(IDE7_MAJOR, 64),                /* hdo, hdp */
   90.21 -    MKDEV(IDE8_MAJOR, 0), MKDEV(IDE8_MAJOR, 64),                /* hdq, hdr */
   90.22 -    MKDEV(IDE9_MAJOR, 0), MKDEV(IDE9_MAJOR, 64)                 /* hds, hdt */
   90.23 -};
   90.24 -
   90.25 -void ide_probe_devices(xen_disk_info_t* xdi)
   90.26 -{
   90.27 -    int i, unit;
   90.28 -    ide_drive_t *drive;
   90.29 -    xen_disk_t *xd = &xdi->disks[xdi->count];
   90.30 -
   90.31 -    for ( i = 0; i < MAX_HWIFS; i++ )
   90.32 -    {
   90.33 -	ide_hwif_t *hwif = &ide_hwifs[i];
   90.34 -	if ( !hwif->present ) continue;
   90.35 -
   90.36 -        for ( unit = 0; unit < MAX_DRIVES; unit++ )
   90.37 -        {
   90.38 -            drive = &hwif->drives[unit];
   90.39 -
   90.40 -            if ( !drive->present )
   90.41 -                continue;
   90.42 -
   90.43 -	    if ( xdi->count == xdi->max )
   90.44 -                BUG();
   90.45 -
   90.46 -	    /* We export 'raw' linux device numbers to domain 0. */
   90.47 -	    xd->device = ide_devs[(i * MAX_DRIVES) + unit]; 
   90.48 -
   90.49 -	    /*
   90.50 -	     * NB: we use the ide 'media' field (ide_disk, ide_cdrom, etc) as 
   90.51 -	     * our 'type' field (XD_TYPE_DISK, XD_TYPE_CDROM, etc). Hence must 
   90.52 -	     * ensure these are kept in sync.
   90.53 -	     */
   90.54 -	    if ( (xd->info = drive->media) == XD_TYPE_CDROM ) 
   90.55 -		xd->info |= XD_FLAG_RO; 
   90.56 -
   90.57 -	    xd->capacity = current_capacity(drive);
   90.58 -	    xd->domain   = 0;
   90.59 -		
   90.60 -            xdi->count++;
   90.61 -            xd++;
   90.62 -        }
   90.63 -    }
   90.64 -}
    91.1 --- a/xen/drivers/ide/ide.c	Tue Mar 23 09:33:07 2004 +0000
    91.2 +++ b/xen/drivers/ide/ide.c	Tue Mar 23 09:48:06 2004 +0000
    91.3 @@ -128,26 +128,26 @@
    91.4  
    91.5  #define _IDE_C			/* Tell ide.h it's really us */
    91.6  
    91.7 -#include <xeno/config.h>
    91.8 -#include <xeno/module.h>
    91.9 -#include <xeno/types.h>
   91.10 -#include <xeno/lib.h>
   91.11 -/*#include <xeno/kernel.h>*/
   91.12 -#include <xeno/timer.h>
   91.13 -#include <xeno/mm.h>
   91.14 -#include <xeno/interrupt.h>
   91.15 -#include <xeno/major.h>
   91.16 -#include <xeno/errno.h>
   91.17 -#include <xeno/genhd.h>
   91.18 -#include <xeno/blkpg.h>
   91.19 -#include <xeno/slab.h>
   91.20 -#include <xeno/init.h>
   91.21 -#include <xeno/pci.h>
   91.22 -#include <xeno/delay.h>
   91.23 -#include <xeno/ide.h>
   91.24 -/*#include <xeno/devfs_fs_kernel.h>*/
   91.25 -/*#include <xeno/completion.h>*/
   91.26 -/*#include <xeno/reboot.h>*/
   91.27 +#include <xen/config.h>
   91.28 +#include <xen/module.h>
   91.29 +#include <xen/types.h>
   91.30 +#include <xen/lib.h>
   91.31 +/*#include <xen/kernel.h>*/
   91.32 +#include <xen/timer.h>
   91.33 +#include <xen/mm.h>
   91.34 +#include <xen/interrupt.h>
   91.35 +#include <xen/major.h>
   91.36 +#include <xen/errno.h>
   91.37 +#include <xen/genhd.h>
   91.38 +#include <xen/blkpg.h>
   91.39 +#include <xen/slab.h>
   91.40 +#include <xen/init.h>
   91.41 +#include <xen/pci.h>
   91.42 +#include <xen/delay.h>
   91.43 +#include <xen/ide.h>
   91.44 +/*#include <xen/devfs_fs_kernel.h>*/
   91.45 +/*#include <xen/completion.h>*/
   91.46 +/*#include <xen/reboot.h>*/
   91.47  
   91.48  #include <asm/domain_page.h>
   91.49  #include <asm/byteorder.h>
   91.50 @@ -159,7 +159,7 @@
   91.51  #include "ide_modes.h"
   91.52  
   91.53  #ifdef CONFIG_KMOD
   91.54 -#include <xeno/kmod.h>
   91.55 +#include <xen/kmod.h>
   91.56  #endif /* CONFIG_KMOD */
   91.57  
   91.58  #ifdef CONFIG_IDE_TASKFILE_IO
    92.1 --- a/xen/drivers/ide/ide_modes.h	Tue Mar 23 09:33:07 2004 +0000
    92.2 +++ b/xen/drivers/ide/ide_modes.h	Tue Mar 23 09:48:06 2004 +0000
    92.3 @@ -7,7 +7,7 @@
    92.4  #ifndef _IDE_MODES_H
    92.5  #define _IDE_MODES_H
    92.6  
    92.7 -#include <xeno/config.h>
    92.8 +#include <xen/config.h>
    92.9  
   92.10  /*
   92.11   * Shared data/functions for determining best PIO mode for an IDE drive.
    93.1 --- a/xen/drivers/ide/piix.c	Tue Mar 23 09:33:07 2004 +0000
    93.2 +++ b/xen/drivers/ide/piix.c	Tue Mar 23 09:48:06 2004 +0000
    93.3 @@ -53,15 +53,15 @@
    93.4   *
    93.5   */
    93.6  
    93.7 -#include <xeno/config.h>
    93.8 -#include <xeno/types.h>
    93.9 -#include <xeno/kernel.h>
   93.10 -#include <xeno/ioport.h>
   93.11 -#include <xeno/pci.h>
   93.12 -#include <xeno/hdreg.h>
   93.13 -#include <xeno/ide.h>
   93.14 -#include <xeno/delay.h>
   93.15 -#include <xeno/init.h>
   93.16 +#include <xen/config.h>
   93.17 +#include <xen/types.h>
   93.18 +#include <xen/kernel.h>
   93.19 +#include <xen/ioport.h>
   93.20 +#include <xen/pci.h>
   93.21 +#include <xen/hdreg.h>
   93.22 +#include <xen/ide.h>
   93.23 +#include <xen/delay.h>
   93.24 +#include <xen/init.h>
   93.25  
   93.26  #include <asm/io.h>
   93.27  
   93.28 @@ -72,8 +72,8 @@
   93.29  #define DISPLAY_PIIX_TIMINGS
   93.30  
   93.31  #if defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS)
   93.32 -#include <xeno/stat.h>
   93.33 -#include <xeno/proc_fs.h>
   93.34 +#include <xen/stat.h>
   93.35 +#include <xen/proc_fs.h>
   93.36  
   93.37  static int piix_get_info(char *, char **, off_t, int);
   93.38  extern int (*piix_display_info)(char *, char **, off_t, int); /* ide-proc.c */
    94.1 --- a/xen/drivers/message/fusion/isense.h	Tue Mar 23 09:33:07 2004 +0000
    94.2 +++ b/xen/drivers/message/fusion/isense.h	Tue Mar 23 09:48:06 2004 +0000
    94.3 @@ -3,9 +3,9 @@
    94.4  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    94.5  
    94.6  #ifdef __KERNEL__
    94.7 -#include <xeno/types.h>		/* needed for u8, etc. */
    94.8 -#include <xeno/string.h>		/* needed for strcat   */
    94.9 -#include <xeno/kernel.h>		/* needed for sprintf  */
   94.10 +#include <xen/types.h>		/* needed for u8, etc. */
   94.11 +#include <xen/string.h>		/* needed for strcat   */
   94.12 +#include <xen/kernel.h>		/* needed for sprintf  */
   94.13  #else
   94.14      #ifndef U_STUFF_DEFINED
   94.15      #define U_STUFF_DEFINED
    95.1 --- a/xen/drivers/message/fusion/linux_compat.h	Tue Mar 23 09:33:07 2004 +0000
    95.2 +++ b/xen/drivers/message/fusion/linux_compat.h	Tue Mar 23 09:48:06 2004 +0000
    95.3 @@ -4,10 +4,10 @@
    95.4  #define FUSION_LINUX_COMPAT_H
    95.5  /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    95.6  
    95.7 -#include <xeno/version.h>
    95.8 -#include <xeno/config.h>
    95.9 -#include <xeno/kernel.h>
   95.10 -#include <xeno/pci.h>
   95.11 +#include <xen/version.h>
   95.12 +#include <xen/config.h>
   95.13 +#include <xen/kernel.h>
   95.14 +#include <xen/pci.h>
   95.15  
   95.16  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
   95.17  
    96.1 --- a/xen/drivers/message/fusion/mptbase.c	Tue Mar 23 09:33:07 2004 +0000
    96.2 +++ b/xen/drivers/message/fusion/mptbase.c	Tue Mar 23 09:48:06 2004 +0000
    96.3 @@ -88,19 +88,19 @@
    96.4  */
    96.5  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    96.6  
    96.7 -#include <xeno/config.h>
    96.8 -#include <xeno/version.h>
    96.9 -#include <xeno/kernel.h>
   96.10 -#include <xeno/module.h>
   96.11 -#include <xeno/errno.h>
   96.12 -#include <xeno/init.h>
   96.13 -#include <xeno/slab.h>
   96.14 -#include <xeno/types.h>
   96.15 -#include <xeno/pci.h>
   96.16 -#include <xeno/kdev_t.h>
   96.17 -#include <xeno/blkdev.h>
   96.18 -#include <xeno/delay.h>
   96.19 -#include <xeno/interrupt.h>		/* needed for in_interrupt() proto */
   96.20 +#include <xen/config.h>
   96.21 +#include <xen/version.h>
   96.22 +#include <xen/kernel.h>
   96.23 +#include <xen/module.h>
   96.24 +#include <xen/errno.h>
   96.25 +#include <xen/init.h>
   96.26 +#include <xen/slab.h>
   96.27 +#include <xen/types.h>
   96.28 +#include <xen/pci.h>
   96.29 +#include <xen/kdev_t.h>
   96.30 +#include <xen/blkdev.h>
   96.31 +#include <xen/delay.h>
   96.32 +#include <xen/interrupt.h>		/* needed for in_interrupt() proto */
   96.33  #include <asm/byteorder.h>	/* SAE: Necessary... */
   96.34  #include <asm/io.h>
   96.35  #ifdef CONFIG_MTRR
    97.1 --- a/xen/drivers/message/fusion/mptbase.h	Tue Mar 23 09:33:07 2004 +0000
    97.2 +++ b/xen/drivers/message/fusion/mptbase.h	Tue Mar 23 09:48:06 2004 +0000
    97.3 @@ -55,7 +55,7 @@
    97.4  #define MPTBASE_H_INCLUDED
    97.5  /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    97.6  
    97.7 -#include <xeno/timer.h>
    97.8 +#include <xen/timer.h>
    97.9  
   97.10  #include "linux_compat.h"	/* linux-2.2.x (vs. -2.4.x) tweaks */
   97.11  #include "scsi3.h"		/* SCSI defines */
   97.12 @@ -157,7 +157,7 @@
   97.13  
   97.14  /* SAE: Xen doesn't have a proc filesystem */
   97.15  #if defined(CONFIG_PROC_FS)
   97.16 -#include <xeno/proc_fs.h>
   97.17 +#include <xen/proc_fs.h>
   97.18  #endif
   97.19  
   97.20  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    98.1 --- a/xen/drivers/message/fusion/mptscsih.c	Tue Mar 23 09:33:07 2004 +0000
    98.2 +++ b/xen/drivers/message/fusion/mptscsih.c	Tue Mar 23 09:48:06 2004 +0000
    98.3 @@ -65,19 +65,19 @@
    98.4  */
    98.5  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    98.6  
    98.7 -#include <xeno/types.h>	/* SAE: Necessary... */
    98.8 -#include <xeno/module.h>
    98.9 -#include <xeno/version.h>
   98.10 -#include <xeno/kernel.h>
   98.11 -#include <xeno/init.h>
   98.12 -#include <xeno/errno.h>
   98.13 -#include <xeno/kdev_t.h>
   98.14 -#include <xeno/blkdev.h>
   98.15 -#include <xeno/blk.h>		/* for io_request_lock (spinlock) decl */
   98.16 -#include <xeno/delay.h>	/* for mdelay */
   98.17 -#include <xeno/interrupt.h>	/* needed for in_interrupt() proto */
   98.18 -#include <xeno/reboot.h>	/* notifier code */
   98.19 -#include <xeno/tqueue.h>
   98.20 +#include <xen/types.h>	/* SAE: Necessary... */
   98.21 +#include <xen/module.h>
   98.22 +#include <xen/version.h>
   98.23 +#include <xen/kernel.h>
   98.24 +#include <xen/init.h>
   98.25 +#include <xen/errno.h>
   98.26 +#include <xen/kdev_t.h>
   98.27 +#include <xen/blkdev.h>
   98.28 +#include <xen/blk.h>		/* for io_request_lock (spinlock) decl */
   98.29 +#include <xen/delay.h>	/* for mdelay */
   98.30 +#include <xen/interrupt.h>	/* needed for in_interrupt() proto */
   98.31 +#include <xen/reboot.h>	/* notifier code */
   98.32 +#include <xen/tqueue.h>
   98.33  #include <asm/byteorder.h>	/* SAE: Necessary... */
   98.34  #include "../../scsi/scsi.h"
   98.35  #include "../../scsi/hosts.h"
    99.1 --- a/xen/drivers/message/fusion/mptscsih.h	Tue Mar 23 09:33:07 2004 +0000
    99.2 +++ b/xen/drivers/message/fusion/mptscsih.h	Tue Mar 23 09:48:06 2004 +0000
    99.3 @@ -62,8 +62,8 @@
    99.4  #define SCSIHOST_H_INCLUDED
    99.5  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    99.6  
    99.7 -#include <xeno/tqueue.h>
    99.8 -#include <xeno/version.h>
    99.9 +#include <xen/tqueue.h>
   99.10 +#include <xen/version.h>
   99.11  
   99.12  /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
   99.13  /*
   99.14 @@ -155,7 +155,7 @@ struct mptscsih_driver_setup
   99.15  		 *	Super HACK!  -by sralston:-(
   99.16  		 *	(good grief; heaven help me!)
   99.17  		 */
   99.18 -#		include <xeno/capability.h>
   99.19 +#		include <xen/capability.h>
   99.20  #		if !defined(CAP_LEASE) && !defined(MODULE)
   99.21  #			undef MPT_SCSIHOST_NEED_ENTRY_EXIT_HOOKUPS
   99.22  #		endif
   99.23 @@ -168,12 +168,12 @@ struct mptscsih_driver_setup
   99.24  
   99.25  /*
   99.26   *	tq_scheduler disappeared @ lk-2.4.0-test12
   99.27 - *	(right when <xeno/sched.h> newly defined TQ_ACTIVE)
   99.28 + *	(right when <xen/sched.h> newly defined TQ_ACTIVE)
   99.29   *	tq_struct reworked in 2.5.41. Include workqueue.h.
   99.30   */
   99.31  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,41)
   99.32 -#	include <xeno/sched.h>
   99.33 -#	include <xeno/workqueue.h>
   99.34 +#	include <xen/sched.h>
   99.35 +#	include <xen/workqueue.h>
   99.36  #define SCHEDULE_TASK(x)		\
   99.37  	if (schedule_work(x) == 0) {	\
   99.38  		/*MOD_DEC_USE_COUNT*/;	\
   99.39 @@ -181,7 +181,7 @@ struct mptscsih_driver_setup
   99.40  #else
   99.41  #define HAVE_TQ_SCHED	1
   99.42  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
   99.43 -#	include <xeno/sched.h>
   99.44 +#	include <xen/sched.h>
   99.45  #	ifdef TQ_ACTIVE
   99.46  #		undef HAVE_TQ_SCHED
   99.47  #	endif
   100.1 --- a/xen/drivers/message/fusion/scsi3.h	Tue Mar 23 09:33:07 2004 +0000
   100.2 +++ b/xen/drivers/message/fusion/scsi3.h	Tue Mar 23 09:48:06 2004 +0000
   100.3 @@ -21,7 +21,7 @@
   100.4   *  Includes
   100.5   */
   100.6  #ifdef __KERNEL__
   100.7 -#include <xeno/types.h>
   100.8 +#include <xen/types.h>
   100.9  #else
  100.10      #ifndef U_STUFF_DEFINED
  100.11      #define U_STUFF_DEFINED
   101.1 --- a/xen/drivers/net/3c59x.c	Tue Mar 23 09:33:07 2004 +0000
   101.2 +++ b/xen/drivers/net/3c59x.c	Tue Mar 23 09:48:06 2004 +0000
   101.3 @@ -224,26 +224,26 @@ static int vortex_debug = 1;
   101.4  #error You must compile this driver with "-O".
   101.5  #endif
   101.6  
   101.7 -#include <xeno/config.h>
   101.8 -#include <xeno/lib.h>
   101.9 -#include <xeno/module.h>
  101.10 -//#include <xeno/kernel.h>
  101.11 -#include <xeno/sched.h>
  101.12 -//#include <xeno/string.h>
  101.13 -#include <xeno/timer.h>
  101.14 -#include <xeno/errno.h>
  101.15 -//#include <xeno/in.h>
  101.16 -#include <xeno/ioport.h>
  101.17 -#include <xeno/slab.h>
  101.18 -#include <xeno/interrupt.h>
  101.19 -#include <xeno/pci.h>
  101.20 -#include <xeno/mii.h>
  101.21 -#include <xeno/init.h>
  101.22 -#include <xeno/netdevice.h>
  101.23 -#include <xeno/etherdevice.h>
  101.24 -#include <xeno/skbuff.h>
  101.25 -#include <xeno/ethtool.h>
  101.26 -//#include <xeno/highmem.h>
  101.27 +#include <xen/config.h>
  101.28 +#include <xen/lib.h>
  101.29 +#include <xen/module.h>
  101.30 +//#include <xen/kernel.h>
  101.31 +#include <xen/sched.h>
  101.32 +//#include <xen/string.h>
  101.33 +#include <xen/timer.h>
  101.34 +#include <xen/errno.h>
  101.35 +//#include <xen/in.h>
  101.36 +#include <xen/ioport.h>
  101.37 +#include <xen/slab.h>
  101.38 +#include <xen/interrupt.h>
  101.39 +#include <xen/pci.h>
  101.40 +#include <xen/mii.h>
  101.41 +#include <xen/init.h>
  101.42 +#include <xen/netdevice.h>
  101.43 +#include <xen/etherdevice.h>
  101.44 +#include <xen/skbuff.h>
  101.45 +#include <xen/ethtool.h>
  101.46 +//#include <xen/highmem.h>
  101.47  #include <asm/irq.h>			/* For NR_IRQS only. */
  101.48  #include <asm/bitops.h>
  101.49  #include <asm/io.h>
  101.50 @@ -262,7 +262,7 @@ static int vortex_debug = 1;
  101.51  
  101.52  #define RUN_AT(x) (jiffies + (x))
  101.53  
  101.54 -#include <xeno/delay.h>
  101.55 +#include <xen/delay.h>
  101.56  
  101.57  
  101.58  static char version[] __devinitdata =
   102.1 --- a/xen/drivers/net/8139too.c	Tue Mar 23 09:33:07 2004 +0000
   102.2 +++ b/xen/drivers/net/8139too.c	Tue Mar 23 09:48:06 2004 +0000
   102.3 @@ -96,30 +96,30 @@
   102.4  #define DRV_VERSION	"0.9.26"
   102.5  
   102.6  
   102.7 -#include <xeno/config.h>
   102.8 -#include <xeno/module.h>
   102.9 +#include <xen/config.h>
  102.10 +#include <xen/module.h>
  102.11  
  102.12  #ifdef XEN
  102.13  typedef int pid_t;
  102.14 -#include <xeno/lib.h>
  102.15 +#include <xen/lib.h>
  102.16  #endif
  102.17 -#include <xeno/kernel.h>
  102.18 -#include <xeno/compiler.h>
  102.19 -#include <xeno/pci.h>
  102.20 -#include <xeno/init.h>
  102.21 -#include <xeno/ioport.h>
  102.22 -#include <xeno/netdevice.h>
  102.23 -#include <xeno/etherdevice.h>
  102.24 +#include <xen/kernel.h>
  102.25 +#include <xen/compiler.h>
  102.26 +#include <xen/pci.h>
  102.27 +#include <xen/init.h>
  102.28 +#include <xen/ioport.h>
  102.29 +#include <xen/netdevice.h>
  102.30 +#include <xen/etherdevice.h>
  102.31  #ifndef XEN
  102.32 -#include <xeno/rtnetlink.h>
  102.33 +#include <xen/rtnetlink.h>
  102.34  #endif
  102.35 -#include <xeno/delay.h>
  102.36 -#include <xeno/ethtool.h>
  102.37 -#include <xeno/mii.h>
  102.38 +#include <xen/delay.h>
  102.39 +#include <xen/ethtool.h>
  102.40 +#include <xen/mii.h>
  102.41  #ifndef XEN
  102.42 -#include <xeno/completion.h>
  102.43 +#include <xen/completion.h>
  102.44  #endif
  102.45 -#include <xeno/crc32.h>
  102.46 +#include <xen/crc32.h>
  102.47  #include <asm/io.h>
  102.48  #include <asm/uaccess.h>
  102.49  
   103.1 --- a/xen/drivers/net/Space.c	Tue Mar 23 09:33:07 2004 +0000
   103.2 +++ b/xen/drivers/net/Space.c	Tue Mar 23 09:48:06 2004 +0000
   103.3 @@ -11,8 +11,8 @@
   103.4   *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
   103.5   *		Donald J. Becker, <becker@scyld.com>
   103.6   */
   103.7 -#include <xeno/config.h>
   103.8 -#include <xeno/netdevice.h>
   103.9 +#include <xen/config.h>
  103.10 +#include <xen/netdevice.h>
  103.11  
  103.12  /*
  103.13   * KAF (23/7/02): All the probe shit is gone from here -- each network
   104.1 --- a/xen/drivers/net/dummy.c	Tue Mar 23 09:33:07 2004 +0000
   104.2 +++ b/xen/drivers/net/dummy.c	Tue Mar 23 09:48:06 2004 +0000
   104.3 @@ -4,11 +4,11 @@
   104.4   * A cut down version of Linux's dummy network driver. GPLed and all that.
   104.5   */
   104.6  
   104.7 -#include <xeno/config.h>
   104.8 -#include <xeno/module.h>
   104.9 -#include <xeno/kernel.h>
  104.10 -#include <xeno/netdevice.h>
  104.11 -#include <xeno/init.h>
  104.12 +#include <xen/config.h>
  104.13 +#include <xen/module.h>
  104.14 +#include <xen/kernel.h>
  104.15 +#include <xen/netdevice.h>
  104.16 +#include <xen/init.h>
  104.17  
  104.18  static int dummy_xmit(struct sk_buff *skb, struct net_device *dev);
  104.19  static struct net_device_stats *dummy_get_stats(struct net_device *dev);
   105.1 --- a/xen/drivers/net/e100/e100.h	Tue Mar 23 09:33:07 2004 +0000
   105.2 +++ b/xen/drivers/net/e100/e100.h	Tue Mar 23 09:48:06 2004 +0000
   105.3 @@ -21,44 +21,44 @@
   105.4    file called LICENSE.
   105.5    
   105.6    Contact Information:
   105.7 -  Linux NICS <xeno.nics@intel.com>
   105.8 +  Linux NICS <linux.nics@intel.com>
   105.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  105.10  *******************************************************************************/
  105.11  
  105.12  #ifndef _E100_INC_
  105.13  #define _E100_INC_
  105.14  
  105.15 -#include <xeno/module.h>
  105.16 -#include <xeno/types.h>
  105.17 -#include <xeno/init.h>
  105.18 -#include <xeno/mm.h>
  105.19 -#include <xeno/errno.h>
  105.20 -#include <xeno/ioport.h>
  105.21 -#include <xeno/pci.h>
  105.22 -#include <xeno/kernel.h>
  105.23 -#include <xeno/netdevice.h>
  105.24 -#include <xeno/etherdevice.h>
  105.25 -#include <xeno/skbuff.h>
  105.26 -#include <xeno/delay.h>
  105.27 -#include <xeno/timer.h>
  105.28 -#include <xeno/slab.h>
  105.29 -#include <xeno/interrupt.h>
  105.30 -#include <xeno/version.h>
  105.31 -#include <xeno/string.h>
  105.32 -/*#include <xeno/wait.h>*/
  105.33 -#include <xeno/reboot.h>
  105.34 +#include <xen/module.h>
  105.35 +#include <xen/types.h>
  105.36 +#include <xen/init.h>
  105.37 +#include <xen/mm.h>
  105.38 +#include <xen/errno.h>
  105.39 +#include <xen/ioport.h>
  105.40 +#include <xen/pci.h>
  105.41 +#include <xen/kernel.h>
  105.42 +#include <xen/netdevice.h>
  105.43 +#include <xen/etherdevice.h>
  105.44 +#include <xen/skbuff.h>
  105.45 +#include <xen/delay.h>
  105.46 +#include <xen/timer.h>
  105.47 +#include <xen/slab.h>
  105.48 +#include <xen/interrupt.h>
  105.49 +#include <xen/version.h>
  105.50 +#include <xen/string.h>
  105.51 +/*#include <xen/wait.h>*/
  105.52 +#include <xen/reboot.h>
  105.53  #include <asm/io.h>
  105.54  #include <asm/unaligned.h>
  105.55  #include <asm/processor.h>
  105.56 -#include <xeno/ethtool.h>
  105.57 -/*#include <xeno/inetdevice.h>*/
  105.58 +#include <xen/ethtool.h>
  105.59 +/*#include <xen/inetdevice.h>*/
  105.60  #include <asm/bitops.h>
  105.61  
  105.62 -#include <xeno/if.h>
  105.63 +#include <xen/if.h>
  105.64  #include <asm/uaccess.h>
  105.65 -/*#include <xeno/ip.h>*/
  105.66 -#include <xeno/if_vlan.h>
  105.67 -#include <xeno/mii.h>
  105.68 +/*#include <xen/ip.h>*/
  105.69 +#include <xen/if_vlan.h>
  105.70 +#include <xen/mii.h>
  105.71  
  105.72  #define yield() ((void)0)
  105.73  
   106.1 --- a/xen/drivers/net/e100/e100_config.c	Tue Mar 23 09:33:07 2004 +0000
   106.2 +++ b/xen/drivers/net/e100/e100_config.c	Tue Mar 23 09:48:06 2004 +0000
   106.3 @@ -21,7 +21,7 @@
   106.4    file called LICENSE.
   106.5    
   106.6    Contact Information:
   106.7 -  Linux NICS <xeno.nics@intel.com>
   106.8 +  Linux NICS <linux.nics@intel.com>
   106.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  106.10  *******************************************************************************/
  106.11  
   107.1 --- a/xen/drivers/net/e100/e100_config.h	Tue Mar 23 09:33:07 2004 +0000
   107.2 +++ b/xen/drivers/net/e100/e100_config.h	Tue Mar 23 09:48:06 2004 +0000
   107.3 @@ -21,7 +21,7 @@
   107.4    file called LICENSE.
   107.5    
   107.6    Contact Information:
   107.7 -  Linux NICS <xeno.nics@intel.com>
   107.8 +  Linux NICS <linux.nics@intel.com>
   107.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  107.10  *******************************************************************************/
  107.11  
   108.1 --- a/xen/drivers/net/e100/e100_eeprom.c	Tue Mar 23 09:33:07 2004 +0000
   108.2 +++ b/xen/drivers/net/e100/e100_eeprom.c	Tue Mar 23 09:48:06 2004 +0000
   108.3 @@ -21,7 +21,7 @@
   108.4    file called LICENSE.
   108.5    
   108.6    Contact Information:
   108.7 -  Linux NICS <xeno.nics@intel.com>
   108.8 +  Linux NICS <linux.nics@intel.com>
   108.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  108.10  *******************************************************************************/
  108.11  
   109.1 --- a/xen/drivers/net/e100/e100_main.c	Tue Mar 23 09:33:07 2004 +0000
   109.2 +++ b/xen/drivers/net/e100/e100_main.c	Tue Mar 23 09:48:06 2004 +0000
   109.3 @@ -21,7 +21,7 @@
   109.4    file called LICENSE.
   109.5    
   109.6    Contact Information:
   109.7 -  Linux NICS <xeno.nics@intel.com>
   109.8 +  Linux NICS <linux.nics@intel.com>
   109.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  109.10  *******************************************************************************/
  109.11  
  109.12 @@ -78,10 +78,10 @@
  109.13   * 2.1.24       10/7/02
  109.14   */
  109.15   
  109.16 -#include <xeno/config.h>
  109.17 +#include <xen/config.h>
  109.18  /*#include <net/checksum.h>*/
  109.19 -/*#include <xeno/tcp.h>*/
  109.20 -/*#include <xeno/udp.h>*/
  109.21 +/*#include <xen/tcp.h>*/
  109.22 +/*#include <xen/udp.h>*/
  109.23  #include "e100.h"
  109.24  #include "e100_ucode.h"
  109.25  #include "e100_config.h"
  109.26 @@ -379,7 +379,7 @@ static inline tcb_t *e100_prepare_xmit_b
  109.27  					    struct sk_buff *);
  109.28  static void e100_set_multi_exec(struct net_device *dev);
  109.29  
  109.30 -MODULE_AUTHOR("Intel Corporation, <xeno.nics@intel.com>");
  109.31 +MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
  109.32  MODULE_DESCRIPTION("Intel(R) PRO/100 Network Driver");
  109.33  MODULE_LICENSE("GPL");
  109.34  
   110.1 --- a/xen/drivers/net/e100/e100_phy.c	Tue Mar 23 09:33:07 2004 +0000
   110.2 +++ b/xen/drivers/net/e100/e100_phy.c	Tue Mar 23 09:48:06 2004 +0000
   110.3 @@ -21,7 +21,7 @@
   110.4    file called LICENSE.
   110.5    
   110.6    Contact Information:
   110.7 -  Linux NICS <xeno.nics@intel.com>
   110.8 +  Linux NICS <linux.nics@intel.com>
   110.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  110.10  *******************************************************************************/
  110.11  
   111.1 --- a/xen/drivers/net/e100/e100_phy.h	Tue Mar 23 09:33:07 2004 +0000
   111.2 +++ b/xen/drivers/net/e100/e100_phy.h	Tue Mar 23 09:48:06 2004 +0000
   111.3 @@ -21,7 +21,7 @@
   111.4    file called LICENSE.
   111.5    
   111.6    Contact Information:
   111.7 -  Linux NICS <xeno.nics@intel.com>
   111.8 +  Linux NICS <linux.nics@intel.com>
   111.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  111.10  *******************************************************************************/
  111.11  
   112.1 --- a/xen/drivers/net/e100/e100_test.c	Tue Mar 23 09:33:07 2004 +0000
   112.2 +++ b/xen/drivers/net/e100/e100_test.c	Tue Mar 23 09:48:06 2004 +0000
   112.3 @@ -21,7 +21,7 @@
   112.4    file called LICENSE.
   112.5    
   112.6    Contact Information:
   112.7 -  Linux NICS <xeno.nics@intel.com>
   112.8 +  Linux NICS <linux.nics@intel.com>
   112.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  112.10  *******************************************************************************/
  112.11  
   113.1 --- a/xen/drivers/net/e100/e100_ucode.h	Tue Mar 23 09:33:07 2004 +0000
   113.2 +++ b/xen/drivers/net/e100/e100_ucode.h	Tue Mar 23 09:48:06 2004 +0000
   113.3 @@ -21,7 +21,7 @@
   113.4    file called LICENSE.
   113.5    
   113.6    Contact Information:
   113.7 -  Linux NICS <xeno.nics@intel.com>
   113.8 +  Linux NICS <linux.nics@intel.com>
   113.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  113.10  *******************************************************************************/
  113.11  
   114.1 --- a/xen/drivers/net/e1000/e1000.h	Tue Mar 23 09:33:07 2004 +0000
   114.2 +++ b/xen/drivers/net/e1000/e1000.h	Tue Mar 23 09:48:06 2004 +0000
   114.3 @@ -21,7 +21,7 @@
   114.4    file called LICENSE.
   114.5    
   114.6    Contact Information:
   114.7 -  Linux NICS <xeno.nics@intel.com>
   114.8 +  Linux NICS <linux.nics@intel.com>
   114.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  114.10  
  114.11  *******************************************************************************/
  114.12 @@ -32,48 +32,48 @@
  114.13  #ifndef _E1000_H_
  114.14  #define _E1000_H_
  114.15  
  114.16 -//#include <xeno/stddef.h>
  114.17 -#include <xeno/config.h>
  114.18 -#include <xeno/module.h>
  114.19 -#include <xeno/types.h>
  114.20 +//#include <xen/stddef.h>
  114.21 +#include <xen/config.h>
  114.22 +#include <xen/module.h>
  114.23 +#include <xen/types.h>
  114.24  #include <asm/byteorder.h>
  114.25 -#include <xeno/init.h>
  114.26 -#include <xeno/mm.h>
  114.27 -#include <xeno/errno.h>
  114.28 -#include <xeno/ioport.h>
  114.29 -#include <xeno/pci.h>
  114.30 -#include <xeno/kernel.h>
  114.31 -#include <xeno/netdevice.h>
  114.32 -#include <xeno/etherdevice.h>
  114.33 -#include <xeno/skbuff.h>
  114.34 -#include <xeno/delay.h>
  114.35 -#include <xeno/timer.h>
  114.36 -#include <xeno/slab.h>
  114.37 -#include <xeno/interrupt.h>
  114.38 -#include <xeno/string.h>
  114.39 -//#include <xeno/pagemap.h>
  114.40 +#include <xen/init.h>
  114.41 +#include <xen/mm.h>
  114.42 +#include <xen/errno.h>
  114.43 +#include <xen/ioport.h>
  114.44 +#include <xen/pci.h>
  114.45 +#include <xen/kernel.h>
  114.46 +#include <xen/netdevice.h>
  114.47 +#include <xen/etherdevice.h>
  114.48 +#include <xen/skbuff.h>
  114.49 +#include <xen/delay.h>
  114.50 +#include <xen/timer.h>
  114.51 +#include <xen/slab.h>
  114.52 +#include <xen/interrupt.h>
  114.53 +#include <xen/string.h>
  114.54 +//#include <xen/pagemap.h>
  114.55  #include <asm/bitops.h>
  114.56  #include <asm/io.h>
  114.57  #include <asm/irq.h>
  114.58 -//#include <xeno/capability.h>
  114.59 -#include <xeno/in.h>
  114.60 -//#include <xeno/ip.h>
  114.61 -//#include <xeno/tcp.h>
  114.62 -//#include <xeno/udp.h>
  114.63 +//#include <xen/capability.h>
  114.64 +#include <xen/in.h>
  114.65 +//#include <xen/ip.h>
  114.66 +//#include <xen/tcp.h>
  114.67 +//#include <xen/udp.h>
  114.68  //#include <net/pkt_sched.h>
  114.69 -#include <xeno/list.h>
  114.70 -#include <xeno/reboot.h>
  114.71 +#include <xen/list.h>
  114.72 +#include <xen/reboot.h>
  114.73  #ifdef NETIF_F_TSO
  114.74  #include <net/checksum.h>
  114.75  #endif
  114.76  #ifdef SIOCGMIIPHY
  114.77 -#include <xeno/mii.h>
  114.78 +#include <xen/mii.h>
  114.79  #endif
  114.80  #ifdef SIOCETHTOOL
  114.81 -#include <xeno/ethtool.h>
  114.82 +#include <xen/ethtool.h>
  114.83  #endif
  114.84  #ifdef NETIF_F_HW_VLAN_TX
  114.85 -#include <xeno/if_vlan.h>
  114.86 +#include <xen/if_vlan.h>
  114.87  #endif
  114.88  
  114.89  #define BAR_0		0
   115.1 --- a/xen/drivers/net/e1000/e1000_ethtool.c	Tue Mar 23 09:33:07 2004 +0000
   115.2 +++ b/xen/drivers/net/e1000/e1000_ethtool.c	Tue Mar 23 09:48:06 2004 +0000
   115.3 @@ -21,7 +21,7 @@
   115.4    file called LICENSE.
   115.5    
   115.6    Contact Information:
   115.7 -  Linux NICS <xeno.nics@intel.com>
   115.8 +  Linux NICS <linux.nics@intel.com>
   115.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  115.10  
  115.11  *******************************************************************************/
   116.1 --- a/xen/drivers/net/e1000/e1000_hw.c	Tue Mar 23 09:33:07 2004 +0000
   116.2 +++ b/xen/drivers/net/e1000/e1000_hw.c	Tue Mar 23 09:48:06 2004 +0000
   116.3 @@ -21,7 +21,7 @@
   116.4    file called LICENSE.
   116.5    
   116.6    Contact Information:
   116.7 -  Linux NICS <xeno.nics@intel.com>
   116.8 +  Linux NICS <linux.nics@intel.com>
   116.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  116.10  
  116.11  *******************************************************************************/
   117.1 --- a/xen/drivers/net/e1000/e1000_hw.h	Tue Mar 23 09:33:07 2004 +0000
   117.2 +++ b/xen/drivers/net/e1000/e1000_hw.h	Tue Mar 23 09:48:06 2004 +0000
   117.3 @@ -21,7 +21,7 @@
   117.4    file called LICENSE.
   117.5    
   117.6    Contact Information:
   117.7 -  Linux NICS <xeno.nics@intel.com>
   117.8 +  Linux NICS <linux.nics@intel.com>
   117.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  117.10  
  117.11  *******************************************************************************/
   118.1 --- a/xen/drivers/net/e1000/e1000_main.c	Tue Mar 23 09:33:07 2004 +0000
   118.2 +++ b/xen/drivers/net/e1000/e1000_main.c	Tue Mar 23 09:48:06 2004 +0000
   118.3 @@ -21,7 +21,7 @@
   118.4    file called LICENSE.
   118.5    
   118.6    Contact Information:
   118.7 -  Linux NICS <xeno.nics@intel.com>
   118.8 +  Linux NICS <linux.nics@intel.com>
   118.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  118.10  
  118.11  *******************************************************************************/
  118.12 @@ -204,7 +204,7 @@ static struct pci_driver e1000_driver = 
  118.13  #endif
  118.14  };
  118.15  
  118.16 -MODULE_AUTHOR("Intel Corporation, <xeno.nics@intel.com>");
  118.17 +MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
  118.18  MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
  118.19  MODULE_LICENSE("GPL");
  118.20  
   119.1 --- a/xen/drivers/net/e1000/e1000_osdep.h	Tue Mar 23 09:33:07 2004 +0000
   119.2 +++ b/xen/drivers/net/e1000/e1000_osdep.h	Tue Mar 23 09:48:06 2004 +0000
   119.3 @@ -21,7 +21,7 @@
   119.4    file called LICENSE.
   119.5    
   119.6    Contact Information:
   119.7 -  Linux NICS <xeno.nics@intel.com>
   119.8 +  Linux NICS <linux.nics@intel.com>
   119.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  119.10  
  119.11  *******************************************************************************/
  119.12 @@ -34,12 +34,12 @@
  119.13  #ifndef _E1000_OSDEP_H_
  119.14  #define _E1000_OSDEP_H_
  119.15  
  119.16 -#include <xeno/types.h>
  119.17 -#include <xeno/pci.h>
  119.18 -#include <xeno/delay.h>
  119.19 +#include <xen/types.h>
  119.20 +#include <xen/pci.h>
  119.21 +#include <xen/delay.h>
  119.22  #include <asm/io.h>
  119.23 -#include <xeno/interrupt.h>
  119.24 -#include <xeno/sched.h>
  119.25 +#include <xen/interrupt.h>
  119.26 +#include <xen/sched.h>
  119.27  #include "kcompat.h"
  119.28  
  119.29  #define usec_delay(x) udelay(x)
   120.1 --- a/xen/drivers/net/e1000/e1000_param.c	Tue Mar 23 09:33:07 2004 +0000
   120.2 +++ b/xen/drivers/net/e1000/e1000_param.c	Tue Mar 23 09:48:06 2004 +0000
   120.3 @@ -21,7 +21,7 @@
   120.4    file called LICENSE.
   120.5    
   120.6    Contact Information:
   120.7 -  Linux NICS <xeno.nics@intel.com>
   120.8 +  Linux NICS <linux.nics@intel.com>
   120.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  120.10  
  120.11  *******************************************************************************/
   121.1 --- a/xen/drivers/net/e1000/kcompat.c	Tue Mar 23 09:33:07 2004 +0000
   121.2 +++ b/xen/drivers/net/e1000/kcompat.c	Tue Mar 23 09:48:06 2004 +0000
   121.3 @@ -21,7 +21,7 @@
   121.4    file called LICENSE.
   121.5    
   121.6    Contact Information:
   121.7 -  Linux NICS <xeno.nics@intel.com>
   121.8 +  Linux NICS <linux.nics@intel.com>
   121.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  121.10  
  121.11  *******************************************************************************/
   122.1 --- a/xen/drivers/net/e1000/kcompat.h	Tue Mar 23 09:33:07 2004 +0000
   122.2 +++ b/xen/drivers/net/e1000/kcompat.h	Tue Mar 23 09:48:06 2004 +0000
   122.3 @@ -21,7 +21,7 @@
   122.4    file called LICENSE.
   122.5    
   122.6    Contact Information:
   122.7 -  Linux NICS <xeno.nics@intel.com>
   122.8 +  Linux NICS <linux.nics@intel.com>
   122.9    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  122.10  
  122.11  *******************************************************************************/
  122.12 @@ -29,17 +29,17 @@
  122.13  #ifndef _KCOMPAT_H_
  122.14  #define _KCOMPAT_H_
  122.15  
  122.16 -#include <xeno/version.h>
  122.17 -#include <xeno/types.h>
  122.18 -#include <xeno/errno.h>
  122.19 -#include <xeno/module.h>
  122.20 -#include <xeno/pci.h>
  122.21 -#include <xeno/netdevice.h>
  122.22 -#include <xeno/ioport.h>
  122.23 -#include <xeno/slab.h>
  122.24 -//#include <xeno/pagemap.h>
  122.25 -#include <xeno/list.h>
  122.26 -#include <xeno/sched.h>
  122.27 +#include <xen/version.h>
  122.28 +#include <xen/types.h>
  122.29 +#include <xen/errno.h>
  122.30 +#include <xen/module.h>
  122.31 +#include <xen/pci.h>
  122.32 +#include <xen/netdevice.h>
  122.33 +#include <xen/ioport.h>
  122.34 +#include <xen/slab.h>
  122.35 +//#include <xen/pagemap.h>
  122.36 +#include <xen/list.h>
  122.37 +#include <xen/sched.h>
  122.38  #include <asm/io.h>
  122.39  
  122.40  #ifndef IRQ_HANDLED
  122.41 @@ -296,7 +296,7 @@ static inline void _kc_synchronize_irq()
  122.42  #undef synchronize_irq
  122.43  #define synchronize_irq(X) _kc_synchronize_irq()
  122.44  
  122.45 -#include <xeno/tqueue.h>
  122.46 +#include <xen/tqueue.h>
  122.47  #define work_struct tq_struct
  122.48  #define INIT_WORK INIT_TQUEUE
  122.49  #define schedule_work schedule_task
   123.1 --- a/xen/drivers/net/net_init.c	Tue Mar 23 09:33:07 2004 +0000
   123.2 +++ b/xen/drivers/net/net_init.c	Tue Mar 23 09:48:06 2004 +0000
   123.3 @@ -33,25 +33,25 @@
   123.4  
   123.5  */
   123.6  
   123.7 -#include <xeno/config.h>
   123.8 -#include <xeno/module.h>
   123.9 -#include <xeno/errno.h>
  123.10 -//#include <xeno/kernel.h>
  123.11 -#include <xeno/sched.h>
  123.12 -#include <xeno/types.h>
  123.13 -//#include <xeno/fs.h>
  123.14 -#include <xeno/slab.h>
  123.15 -#include <xeno/if_ether.h>
  123.16 -#include <xeno/lib.h>
  123.17 -#include <xeno/netdevice.h>
  123.18 -#include <xeno/etherdevice.h>
  123.19 -//#include <xeno/fddidevice.h>
  123.20 -//#include <xeno/hippidevice.h>
  123.21 -//#include <xeno/trdevice.h>
  123.22 -//#include <xeno/fcdevice.h>
  123.23 -//#include <xeno/if_arp.h>
  123.24 -//#include <xeno/if_ltalk.h>
  123.25 -//#include <xeno/rtnetlink.h>
  123.26 +#include <xen/config.h>
  123.27 +#include <xen/module.h>
  123.28 +#include <xen/errno.h>
  123.29 +//#include <xen/kernel.h>
  123.30 +#include <xen/sched.h>
  123.31 +#include <xen/types.h>
  123.32 +//#include <xen/fs.h>
  123.33 +#include <xen/slab.h>
  123.34 +#include <xen/if_ether.h>
  123.35 +#include <xen/lib.h>
  123.36 +#include <xen/netdevice.h>
  123.37 +#include <xen/etherdevice.h>
  123.38 +//#include <xen/fddidevice.h>
  123.39 +//#include <xen/hippidevice.h>
  123.40 +//#include <xen/trdevice.h>
  123.41 +//#include <xen/fcdevice.h>
  123.42 +//#include <xen/if_arp.h>
  123.43 +//#include <xen/if_ltalk.h>
  123.44 +//#include <xen/rtnetlink.h>
  123.45  //#include <net/neighbour.h>
  123.46  
  123.47  #define rtnl_lock() ((void)0)
   124.1 --- a/xen/drivers/net/pcnet32.c	Tue Mar 23 09:33:07 2004 +0000
   124.2 +++ b/xen/drivers/net/pcnet32.c	Tue Mar 23 09:48:06 2004 +0000
   124.3 @@ -29,30 +29,30 @@
   124.4  static const char *version =
   124.5  DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
   124.6  
   124.7 -#include <xeno/module.h>
   124.8 +#include <xen/module.h>
   124.9  
  124.10 -#include <xeno/kernel.h>
  124.11 -#include <xeno/sched.h>
  124.12 -#include <xeno/string.h>
  124.13 -#include <xeno/errno.h>
  124.14 -#include <xeno/ioport.h>
  124.15 -#include <xeno/slab.h>
  124.16 -#include <xeno/interrupt.h>
  124.17 -#include <xeno/pci.h>
  124.18 -#include <xeno/delay.h>
  124.19 -#include <xeno/init.h>
  124.20 -#include <xeno/ethtool.h>
  124.21 -#include <xeno/mii.h>
  124.22 -#include <xeno/crc32.h>
  124.23 +#include <xen/kernel.h>
  124.24 +#include <xen/sched.h>
  124.25 +#include <xen/string.h>
  124.26 +#include <xen/errno.h>
  124.27 +#include <xen/ioport.h>
  124.28 +#include <xen/slab.h>
  124.29 +#include <xen/interrupt.h>
  124.30 +#include <xen/pci.h>
  124.31 +#include <xen/delay.h>
  124.32 +#include <xen/init.h>
  124.33 +#include <xen/ethtool.h>
  124.34 +#include <xen/mii.h>
  124.35 +#include <xen/crc32.h>
  124.36  #include <asm/bitops.h>
  124.37  #include <asm/io.h>
  124.38  #include <asm/dma.h>
  124.39  #include <asm/uaccess.h>
  124.40  
  124.41 -#include <xeno/netdevice.h>
  124.42 -#include <xeno/etherdevice.h>
  124.43 -#include <xeno/skbuff.h>
  124.44 -#include <xeno/spinlock.h>
  124.45 +#include <xen/netdevice.h>
  124.46 +#include <xen/etherdevice.h>
  124.47 +#include <xen/skbuff.h>
  124.48 +#include <xen/spinlock.h>
  124.49  
  124.50  #undef TX_RING_SIZE
  124.51  #undef RX_RING_SIZE
   125.1 --- a/xen/drivers/net/setup.c	Tue Mar 23 09:33:07 2004 +0000
   125.2 +++ b/xen/drivers/net/setup.c	Tue Mar 23 09:48:06 2004 +0000
   125.3 @@ -3,11 +3,11 @@
   125.4   *	New style setup code for the network devices
   125.5   */
   125.6   
   125.7 -#include <xeno/config.h>
   125.8 -#include <xeno/netdevice.h>
   125.9 -#include <xeno/errno.h>
  125.10 -#include <xeno/init.h>
  125.11 -//#include <xeno/netlink.h>
  125.12 +#include <xen/config.h>
  125.13 +#include <xen/netdevice.h>
  125.14 +#include <xen/errno.h>
  125.15 +#include <xen/init.h>
  125.16 +//#include <xen/netlink.h>
  125.17  
  125.18  extern int slip_init_ctrl_dev(void);
  125.19  extern int x25_asy_init_ctrl_dev(void);
   126.1 --- a/xen/drivers/net/tg3.c	Tue Mar 23 09:33:07 2004 +0000
   126.2 +++ b/xen/drivers/net/tg3.c	Tue Mar 23 09:48:06 2004 +0000
   126.3 @@ -5,27 +5,27 @@
   126.4   * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
   126.5   */
   126.6  
   126.7 -#include <xeno/config.h>
   126.8 -
   126.9 -#include <xeno/module.h>
  126.10 -
  126.11 -#include <xeno/kernel.h>
  126.12 -#include <xeno/types.h>
  126.13 -#include <xeno/tqueue.h> // Xen
  126.14 -#include <xeno/compiler.h>
  126.15 -#include <xeno/slab.h>
  126.16 -#include <xeno/delay.h>
  126.17 -#include <xeno/init.h>
  126.18 -#include <xeno/ioport.h>
  126.19 -#include <xeno/pci.h>
  126.20 -#include <xeno/netdevice.h>
  126.21 -#include <xeno/etherdevice.h>
  126.22 -#include <xeno/skbuff.h>
  126.23 -#include <xeno/ethtool.h>
  126.24 -#include <xeno/mii.h>
  126.25 -#include <xeno/if_vlan.h>
  126.26 -//#include <xeno/ip.h>
  126.27 -//#include <xeno/tcp.h>
  126.28 +#include <xen/config.h>
  126.29 +
  126.30 +#include <xen/module.h>
  126.31 +
  126.32 +#include <xen/kernel.h>
  126.33 +#include <xen/types.h>
  126.34 +#include <xen/tqueue.h> // Xen
  126.35 +#include <xen/compiler.h>
  126.36 +#include <xen/slab.h>
  126.37 +#include <xen/delay.h>
  126.38 +#include <xen/init.h>
  126.39 +#include <xen/ioport.h>
  126.40 +#include <xen/pci.h>
  126.41 +#include <xen/netdevice.h>
  126.42 +#include <xen/etherdevice.h>
  126.43 +#include <xen/skbuff.h>
  126.44 +#include <xen/ethtool.h>
  126.45 +#include <xen/mii.h>
  126.46 +#include <xen/if_vlan.h>
  126.47 +//#include <xen/ip.h>
  126.48 +//#include <xen/tcp.h>
  126.49  
  126.50  //#include <net/checksum.h>
  126.51  
   127.1 --- a/xen/drivers/net/tulip/21142.c	Tue Mar 23 09:33:07 2004 +0000
   127.2 +++ b/xen/drivers/net/tulip/21142.c	Tue Mar 23 09:48:06 2004 +0000
   127.3 @@ -15,8 +15,8 @@
   127.4  */
   127.5  
   127.6  #include "tulip.h"
   127.7 -#include <xeno/pci.h>
   127.8 -#include <xeno/delay.h>
   127.9 +#include <xen/pci.h>
  127.10 +#include <xen/delay.h>
  127.11  
  127.12  
  127.13  static u16 t21142_csr13[] = { 0x0001, 0x0009, 0x0009, 0x0000, 0x0001, };
   128.1 --- a/xen/drivers/net/tulip/eeprom.c	Tue Mar 23 09:33:07 2004 +0000
   128.2 +++ b/xen/drivers/net/tulip/eeprom.c	Tue Mar 23 09:48:06 2004 +0000
   128.3 @@ -15,7 +15,7 @@
   128.4  */
   128.5  
   128.6  #include "tulip.h"
   128.7 -#include <xeno/init.h>
   128.8 +#include <xen/init.h>
   128.9  #include <asm/unaligned.h>
  128.10  
  128.11  
   129.1 --- a/xen/drivers/net/tulip/interrupt.c	Tue Mar 23 09:33:07 2004 +0000
   129.2 +++ b/xen/drivers/net/tulip/interrupt.c	Tue Mar 23 09:48:06 2004 +0000
   129.3 @@ -15,9 +15,9 @@
   129.4  */
   129.5  
   129.6  #include "tulip.h"
   129.7 -#include <xeno/config.h>
   129.8 -#include <xeno/etherdevice.h>
   129.9 -#include <xeno/pci.h>
  129.10 +#include <xen/config.h>
  129.11 +#include <xen/etherdevice.h>
  129.12 +#include <xen/pci.h>
  129.13  
  129.14  
  129.15  int tulip_rx_copybreak;
   130.1 --- a/xen/drivers/net/tulip/media.c	Tue Mar 23 09:33:07 2004 +0000
   130.2 +++ b/xen/drivers/net/tulip/media.c	Tue Mar 23 09:48:06 2004 +0000
   130.3 @@ -14,10 +14,10 @@
   130.4  
   130.5  */
   130.6  
   130.7 -#include <xeno/kernel.h>
   130.8 -#include <xeno/mii.h>
   130.9 -#include <xeno/init.h>
  130.10 -#include <xeno/delay.h>
  130.11 +#include <xen/kernel.h>
  130.12 +#include <xen/mii.h>
  130.13 +#include <xen/init.h>
  130.14 +#include <xen/delay.h>
  130.15  #include "tulip.h"
  130.16  
  130.17  
   131.1 --- a/xen/drivers/net/tulip/pnic.c	Tue Mar 23 09:33:07 2004 +0000
   131.2 +++ b/xen/drivers/net/tulip/pnic.c	Tue Mar 23 09:48:06 2004 +0000
   131.3 @@ -14,7 +14,7 @@
   131.4  
   131.5  */
   131.6  
   131.7 -#include <xeno/kernel.h>
   131.8 +#include <xen/kernel.h>
   131.9  #include "tulip.h"
  131.10  
  131.11  
   132.1 --- a/xen/drivers/net/tulip/pnic2.c	Tue Mar 23 09:33:07 2004 +0000
   132.2 +++ b/xen/drivers/net/tulip/pnic2.c	Tue Mar 23 09:48:06 2004 +0000
   132.3 @@ -77,8 +77,8 @@
   132.4  
   132.5  
   132.6  #include "tulip.h"
   132.7 -#include <xeno/pci.h>
   132.8 -#include <xeno/delay.h>
   132.9 +#include <xen/pci.h>
  132.10 +#include <xen/delay.h>
  132.11  
  132.12  
  132.13  void pnic2_timer(unsigned long data)
   133.1 --- a/xen/drivers/net/tulip/tulip.h	Tue Mar 23 09:33:07 2004 +0000
   133.2 +++ b/xen/drivers/net/tulip/tulip.h	Tue Mar 23 09:48:06 2004 +0000
   133.3 @@ -16,13 +16,13 @@
   133.4  #ifndef __NET_TULIP_H__
   133.5  #define __NET_TULIP_H__
   133.6  
   133.7 -#include <xeno/config.h>
   133.8 -#include <xeno/kernel.h>
   133.9 -#include <xeno/types.h>
  133.10 -#include <xeno/spinlock.h>
  133.11 -#include <xeno/netdevice.h>
  133.12 -#include <xeno/timer.h>
  133.13 -#include <xeno/delay.h>
  133.14 +#include <xen/config.h>
  133.15 +#include <xen/kernel.h>
  133.16 +#include <xen/types.h>
  133.17 +#include <xen/spinlock.h>
  133.18 +#include <xen/netdevice.h>
  133.19 +#include <xen/timer.h>
  133.20 +#include <xen/delay.h>
  133.21  #include <asm/io.h>
  133.22  #include <asm/irq.h>
  133.23  
   134.1 --- a/xen/drivers/net/tulip/tulip_core.c	Tue Mar 23 09:33:07 2004 +0000
   134.2 +++ b/xen/drivers/net/tulip/tulip_core.c	Tue Mar 23 09:48:06 2004 +0000
   134.3 @@ -18,16 +18,16 @@
   134.4  #define DRV_VERSION	"0.9.15-pre12"
   134.5  #define DRV_RELDATE	"Aug 9, 2002"
   134.6  
   134.7 -#include <xeno/config.h>
   134.8 -#include <xeno/module.h>
   134.9 +#include <xen/config.h>
  134.10 +#include <xen/module.h>
  134.11  #include "tulip.h"
  134.12 -#include <xeno/pci.h>
  134.13 -#include <xeno/init.h>
  134.14 -#include <xeno/etherdevice.h>
  134.15 -#include <xeno/delay.h>
  134.16 -#include <xeno/mii.h>
  134.17 -#include <xeno/ethtool.h>
  134.18 -#include <xeno/crc32.h>
  134.19 +#include <xen/pci.h>
  134.20 +#include <xen/init.h>
  134.21 +#include <xen/etherdevice.h>
  134.22 +#include <xen/delay.h>
  134.23 +#include <xen/mii.h>
  134.24 +#include <xen/ethtool.h>
  134.25 +#include <xen/crc32.h>
  134.26  #include <asm/unaligned.h>
  134.27  #include <asm/uaccess.h>
  134.28  
   135.1 --- a/xen/drivers/pci/compat.c	Tue Mar 23 09:33:07 2004 +0000
   135.2 +++ b/xen/drivers/pci/compat.c	Tue Mar 23 09:48:06 2004 +0000
   135.3 @@ -6,9 +6,9 @@
   135.4   *	Copyright 1998--2000 Martin Mares <mj@ucw.cz>
   135.5   */
   135.6  
   135.7 -#include <xeno/types.h>
   135.8 -//#include <xeno/kernel.h>
   135.9 -#include <xeno/pci.h>
  135.10 +#include <xen/types.h>
  135.11 +//#include <xen/kernel.h>
  135.12 +#include <xen/pci.h>
  135.13  
  135.14  int
  135.15  pcibios_present(void)
   136.1 --- a/xen/drivers/pci/names.c	Tue Mar 23 09:33:07 2004 +0000
   136.2 +++ b/xen/drivers/pci/names.c	Tue Mar 23 09:48:06 2004 +0000
   136.3 @@ -5,11 +5,11 @@
   136.4   *	David Mosberger-Tang, Martin Mares
   136.5   */
   136.6  
   136.7 -#include <xeno/config.h>
   136.8 -#include <xeno/types.h>
   136.9 -/*#include <xeno/kernel.h>*/
  136.10 -#include <xeno/pci.h>
  136.11 -#include <xeno/init.h>
  136.12 +#include <xen/config.h>
  136.13 +#include <xen/types.h>
  136.14 +/*#include <xen/kernel.h>*/
  136.15 +#include <xen/pci.h>
  136.16 +#include <xen/init.h>
  136.17  
  136.18  #ifdef CONFIG_PCI_NAMES
  136.19  
   137.1 --- a/xen/drivers/pci/pci.c	Tue Mar 23 09:33:07 2004 +0000
   137.2 +++ b/xen/drivers/pci/pci.c	Tue Mar 23 09:48:06 2004 +0000
   137.3 @@ -9,17 +9,17 @@
   137.4   *	Copyright 1997 -- 2000 Martin Mares <mj@ucw.cz>
   137.5   */
   137.6  
   137.7 -#include <xeno/config.h>
   137.8 -#include <xeno/sched.h>
   137.9 -#include <xeno/module.h>
  137.10 -#include <xeno/types.h>
  137.11 -#include <xeno/pci.h>
  137.12 -#include <xeno/init.h>
  137.13 -#include <xeno/slab.h>
  137.14 -#include <xeno/ioport.h>
  137.15 -#include <xeno/spinlock.h>
  137.16 -#include <xeno/delay.h>
  137.17 -#include <xeno/cache.h>
  137.18 +#include <xen/config.h>
  137.19 +#include <xen/sched.h>
  137.20 +#include <xen/module.h>
  137.21 +#include <xen/types.h>
  137.22 +#include <xen/pci.h>
  137.23 +#include <xen/init.h>
  137.24 +#include <xen/slab.h>
  137.25 +#include <xen/ioport.h>
  137.26 +#include <xen/spinlock.h>
  137.27 +#include <xen/delay.h>
  137.28 +#include <xen/cache.h>
  137.29  #include <asm/page.h>
  137.30  
  137.31  #undef DEBUG
   138.1 --- a/xen/drivers/pci/proc.c	Tue Mar 23 09:33:07 2004 +0000
   138.2 +++ b/xen/drivers/pci/proc.c	Tue Mar 23 09:48:06 2004 +0000
   138.3 @@ -6,12 +6,12 @@
   138.4   *	Copyright (c) 1997--1999 Martin Mares <mj@ucw.cz>
   138.5   */
   138.6  
   138.7 -#include <xeno/types.h>
   138.8 -#include <xeno/kernel.h>
   138.9 -#include <xeno/pci.h>
  138.10 -#include <xeno/proc_fs.h>
  138.11 -#include <xeno/init.h>
  138.12 -#include <xeno/seq_file.h>
  138.13 +#include <xen/types.h>
  138.14 +#include <xen/kernel.h>
  138.15 +#include <xen/pci.h>
  138.16 +#include <xen/proc_fs.h>
  138.17 +#include <xen/init.h>
  138.18 +#include <xen/seq_file.h>
  138.19  
  138.20  #include <asm/uaccess.h>
  138.21  #include <asm/byteorder.h>
   139.1 --- a/xen/drivers/pci/quirks.c	Tue Mar 23 09:33:07 2004 +0000
   139.2 +++ b/xen/drivers/pci/quirks.c	Tue Mar 23 09:48:06 2004 +0000
   139.3 @@ -12,12 +12,12 @@
   139.4   *  use the PowerTweak utility (see http://powertweak.sourceforge.net).
   139.5   */
   139.6  
   139.7 -#include <xeno/config.h>
   139.8 -#include <xeno/types.h>
   139.9 -#include <xeno/lib.h>
  139.10 -#include <xeno/pci.h>
  139.11 -#include <xeno/init.h>
  139.12 -#include <xeno/delay.h>
  139.13 +#include <xen/config.h>
  139.14 +#include <xen/types.h>
  139.15 +#include <xen/lib.h>
  139.16 +#include <xen/pci.h>
  139.17 +#include <xen/init.h>
  139.18 +#include <xen/delay.h>
  139.19  
  139.20  #undef DEBUG
  139.21  
   140.1 --- a/xen/drivers/pci/setup-bus.c	Tue Mar 23 09:33:07 2004 +0000
   140.2 +++ b/xen/drivers/pci/setup-bus.c	Tue Mar 23 09:48:06 2004 +0000
   140.3 @@ -17,13 +17,13 @@
   140.4   *	     tighter packing. Prefetchable range support.
   140.5   */
   140.6  
   140.7 -#include <xeno/init.h>
   140.8 -#include <xeno/kernel.h>
   140.9 -#include <xeno/pci.h>
  140.10 -#include <xeno/errno.h>
  140.11 -#include <xeno/ioport.h>
  140.12 -#include <xeno/cache.h>
  140.13 -#include <xeno/slab.h>
  140.14 +#include <xen/init.h>
  140.15 +#include <xen/kernel.h>
  140.16 +#include <xen/pci.h>
  140.17 +#include <xen/errno.h>
  140.18 +#include <xen/ioport.h>
  140.19 +#include <xen/cache.h>
  140.20 +#include <xen/slab.h>
  140.21  
  140.22  
  140.23  #define DEBUG_CONFIG 1
   141.1 --- a/xen/drivers/pci/setup-irq.c	Tue Mar 23 09:33:07 2004 +0000
   141.2 +++ b/xen/drivers/pci/setup-irq.c	Tue Mar 23 09:48:06 2004 +0000
   141.3 @@ -10,12 +10,12 @@
   141.4   */
   141.5  
   141.6  
   141.7 -#include <xeno/init.h>
   141.8 -#include <xeno/kernel.h>
   141.9 -#include <xeno/pci.h>
  141.10 -#include <xeno/errno.h>
  141.11 -#include <xeno/ioport.h>
  141.12 -#include <xeno/cache.h>
  141.13 +#include <xen/init.h>
  141.14 +#include <xen/kernel.h>
  141.15 +#include <xen/pci.h>
  141.16 +#include <xen/errno.h>
  141.17 +#include <xen/ioport.h>
  141.18 +#include <xen/cache.h>
  141.19  
  141.20  
  141.21  #define DEBUG_CONFIG 0
   142.1 --- a/xen/drivers/pci/setup-res.c	Tue Mar 23 09:33:07 2004 +0000
   142.2 +++ b/xen/drivers/pci/setup-res.c	Tue Mar 23 09:48:06 2004 +0000
   142.3 @@ -16,13 +16,13 @@
   142.4   *	     Resource sorting
   142.5   */
   142.6  
   142.7 -#include <xeno/init.h>
   142.8 -#include <xeno/lib.h>
   142.9 -#include <xeno/pci.h>
  142.10 -#include <xeno/errno.h>
  142.11 -#include <xeno/ioport.h>
  142.12 -#include <xeno/cache.h>
  142.13 -#include <xeno/slab.h>
  142.14 +#include <xen/init.h>
  142.15 +#include <xen/lib.h>
  142.16 +#include <xen/pci.h>
  142.17 +#include <xen/errno.h>
  142.18 +#include <xen/ioport.h>
  142.19 +#include <xen/cache.h>
  142.20 +#include <xen/slab.h>
  142.21  
  142.22  
  142.23  #define DEBUG_CONFIG 0
   143.1 --- a/xen/drivers/pci/syscall.c	Tue Mar 23 09:33:07 2004 +0000
   143.2 +++ b/xen/drivers/pci/syscall.c	Tue Mar 23 09:48:06 2004 +0000
   143.3 @@ -7,10 +7,10 @@
   143.4   * magic northbridge registers..
   143.5   */
   143.6  
   143.7 -#include <xeno/sched.h>
   143.8 -#include <xeno/errno.h>
   143.9 -#include <xeno/pci.h>
  143.10 -#include <xeno/smp_lock.h>
  143.11 +#include <xen/sched.h>
  143.12 +#include <xen/errno.h>
  143.13 +#include <xen/pci.h>
  143.14 +#include <xen/smp_lock.h>
  143.15  #include <asm/uaccess.h>
  143.16  
  143.17  
   144.1 --- a/xen/drivers/scsi/BusLogic.c	Tue Mar 23 09:33:07 2004 +0000
   144.2 +++ b/xen/drivers/scsi/BusLogic.c	Tue Mar 23 09:48:06 2004 +0000
   144.3 @@ -30,20 +30,20 @@
   144.4  #define BusLogic_DriverDate		"17 August 1998"
   144.5  
   144.6  
   144.7 -#include <xeno/version.h>
   144.8 -#include <xeno/module.h>
   144.9 -#include <xeno/config.h>
  144.10 -#include <xeno/init.h>
  144.11 -#include <xeno/types.h>
  144.12 -#include <xeno/blk.h>
  144.13 -#include <xeno/blkdev.h>
  144.14 -#include <xeno/delay.h>
  144.15 -#include <xeno/ioport.h>
  144.16 -#include <xeno/mm.h>
  144.17 -#include <xeno/sched.h>
  144.18 -/*#include <xeno/stat.h>*/
  144.19 -#include <xeno/pci.h>
  144.20 -#include <xeno/spinlock.h>
  144.21 +#include <xen/version.h>
  144.22 +#include <xen/module.h>
  144.23 +#include <xen/config.h>
  144.24 +#include <xen/init.h>
  144.25 +#include <xen/types.h>
  144.26 +#include <xen/blk.h>
  144.27 +#include <xen/blkdev.h>
  144.28 +#include <xen/delay.h>
  144.29 +#include <xen/ioport.h>
  144.30 +#include <xen/mm.h>
  144.31 +#include <xen/sched.h>
  144.32 +/*#include <xen/stat.h>*/
  144.33 +#include <xen/pci.h>
  144.34 +#include <xen/spinlock.h>
  144.35  #include <asm/dma.h>
  144.36  #include <asm/io.h>
  144.37  #include <asm/system.h>
   145.1 --- a/xen/drivers/scsi/BusLogic.h	Tue Mar 23 09:33:07 2004 +0000
   145.2 +++ b/xen/drivers/scsi/BusLogic.h	Tue Mar 23 09:48:06 2004 +0000
   145.3 @@ -26,7 +26,7 @@
   145.4  */
   145.5  
   145.6  
   145.7 -#include <xeno/config.h>
   145.8 +#include <xen/config.h>
   145.9  
  145.10  
  145.11  /*
   146.1 --- a/xen/drivers/scsi/FlashPoint.c.inc	Tue Mar 23 09:33:07 2004 +0000
   146.2 +++ b/xen/drivers/scsi/FlashPoint.c.inc	Tue Mar 23 09:48:06 2004 +0000
   146.3 @@ -16,7 +16,7 @@
   146.4  */
   146.5  
   146.6  
   146.7 -#include <xeno/config.h>
   146.8 +#include <xen/config.h>
   146.9  
  146.10  
  146.11  #ifndef CONFIG_SCSI_OMIT_FLASHPOINT
   147.1 --- a/xen/drivers/scsi/aacraid/aachba.c	Tue Mar 23 09:33:07 2004 +0000
   147.2 +++ b/xen/drivers/scsi/aacraid/aachba.c	Tue Mar 23 09:48:06 2004 +0000
   147.3 @@ -22,20 +22,20 @@
   147.4   *
   147.5   */
   147.6  
   147.7 -#include <xeno/config.h>
   147.8 -#include <xeno/module.h>
   147.9 -#include <xeno/kernel.h>
  147.10 -#include <xeno/init.h>
  147.11 -#include <xeno/types.h>
  147.12 -#include <xeno/sched.h>
  147.13 -#include <xeno/pci.h>
  147.14 -#include <xeno/spinlock.h>
  147.15 -#include <xeno/slab.h>
  147.16 -/*#include <xeno/completion.h>*/
  147.17 +#include <xen/config.h>
  147.18 +#include <xen/module.h>
  147.19 +#include <xen/kernel.h>
  147.20 +#include <xen/init.h>
  147.21 +#include <xen/types.h>
  147.22 +#include <xen/sched.h>
  147.23 +#include <xen/pci.h>
  147.24 +#include <xen/spinlock.h>
  147.25 +#include <xen/slab.h>
  147.26 +/*#include <xen/completion.h>*/
  147.27  /*#include <asm/semaphore.h>*/
  147.28  #include <asm/uaccess.h>
  147.29  #define MAJOR_NR SCSI_DISK0_MAJOR	/* For DEVICE_NR() */
  147.30 -#include <xeno/blk.h>
  147.31 +#include <xen/blk.h>
  147.32  #include "scsi.h"
  147.33  #include "hosts.h"
  147.34  #include "sd.h"
   148.1 --- a/xen/drivers/scsi/aacraid/aacraid.h	Tue Mar 23 09:33:07 2004 +0000
   148.2 +++ b/xen/drivers/scsi/aacraid/aacraid.h	Tue Mar 23 09:48:06 2004 +0000
   148.3 @@ -4,7 +4,7 @@
   148.4  #endif
   148.5  
   148.6  #include <asm/byteorder.h>
   148.7 -#include <xeno/interrupt.h>
   148.8 +#include <xen/interrupt.h>
   148.9  
  148.10  /*------------------------------------------------------------------------------
  148.11   *              D E F I N E S
   149.1 --- a/xen/drivers/scsi/aacraid/commctrl.c	Tue Mar 23 09:33:07 2004 +0000
   149.2 +++ b/xen/drivers/scsi/aacraid/commctrl.c	Tue Mar 23 09:48:06 2004 +0000
   149.3 @@ -28,16 +28,16 @@
   149.4   *
   149.5   */
   149.6  
   149.7 -#include <xeno/config.h>
   149.8 -#include <xeno/kernel.h>
   149.9 -#include <xeno/init.h>
  149.10 -#include <xeno/types.h>
  149.11 -#include <xeno/sched.h>
  149.12 -#include <xeno/pci.h>
  149.13 -#include <xeno/spinlock.h>
  149.14 -#include <xeno/slab.h>
  149.15 -/*#include <xeno/completion.h>*/
  149.16 -#include <xeno/blk.h>
  149.17 +#include <xen/config.h>
  149.18 +#include <xen/kernel.h>
  149.19 +#include <xen/init.h>
  149.20 +#include <xen/types.h>
  149.21 +#include <xen/sched.h>
  149.22 +#include <xen/pci.h>
  149.23 +#include <xen/spinlock.h>
  149.24 +#include <xen/slab.h>
  149.25 +/*#include <xen/completion.h>*/
  149.26 +#include <xen/blk.h>
  149.27  /*#include <asm/semaphore.h>*/
  149.28  #include <asm/uaccess.h>
  149.29  #include "scsi.h"
   150.1 --- a/xen/drivers/scsi/aacraid/comminit.c	Tue Mar 23 09:33:07 2004 +0000
   150.2 +++ b/xen/drivers/scsi/aacraid/comminit.c	Tue Mar 23 09:48:06 2004 +0000
   150.3 @@ -29,17 +29,17 @@
   150.4   *
   150.5   */
   150.6  
   150.7 -#include <xeno/config.h>
   150.8 -#include <xeno/kernel.h>
   150.9 -#include <xeno/init.h>
  150.10 -#include <xeno/types.h>
  150.11 -#include <xeno/sched.h>
  150.12 -#include <xeno/pci.h>
  150.13 -#include <xeno/spinlock.h>
  150.14 -#include <xeno/slab.h>
  150.15 -#include <xeno/blk.h>
  150.16 -/*#include <xeno/completion.h>*/
  150.17 -#include <xeno/mm.h>
  150.18 +#include <xen/config.h>
  150.19 +#include <xen/kernel.h>
  150.20 +#include <xen/init.h>
  150.21 +#include <xen/types.h>
  150.22 +#include <xen/sched.h>
  150.23 +#include <xen/pci.h>
  150.24 +#include <xen/spinlock.h>
  150.25 +#include <xen/slab.h>
  150.26 +#include <xen/blk.h>
  150.27 +/*#include <xen/completion.h>*/
  150.28 +#include <xen/mm.h>
  150.29  /*#include <asm/semaphore.h>*/
  150.30  #include "scsi.h"
  150.31  #include "hosts.h"
   151.1 --- a/xen/drivers/scsi/aacraid/commsup.c	Tue Mar 23 09:33:07 2004 +0000
   151.2 +++ b/xen/drivers/scsi/aacraid/commsup.c	Tue Mar 23 09:48:06 2004 +0000
   151.3 @@ -31,21 +31,21 @@
   151.4   *
   151.5   */
   151.6  
   151.7 -#include <xeno/config.h>
   151.8 -#include <xeno/kernel.h>
   151.9 -#include <xeno/init.h>
  151.10 -#include <xeno/types.h>
  151.11 -#include <xeno/sched.h>
  151.12 -#include <xeno/pci.h>
  151.13 -#include <xeno/spinlock.h>
  151.14 -#include <xeno/slab.h>
  151.15 -/*#include <xeno/completion.h>*/
  151.16 +#include <xen/config.h>
  151.17 +#include <xen/kernel.h>
  151.18 +#include <xen/init.h>
  151.19 +#include <xen/types.h>
  151.20 +#include <xen/sched.h>
  151.21 +#include <xen/pci.h>
  151.22 +#include <xen/spinlock.h>
  151.23 +#include <xen/slab.h>
  151.24 +/*#include <xen/completion.h>*/
  151.25  /*#include <asm/semaphore.h>*/
  151.26 -#include <xeno/blk.h>
  151.27 +#include <xen/blk.h>
  151.28  #include <asm/uaccess.h>
  151.29  
  151.30 -#include <xeno/interrupt.h>
  151.31 -#include <xeno/delay.h>
  151.32 +#include <xen/interrupt.h>
  151.33 +#include <xen/delay.h>
  151.34  
  151.35  #include "scsi.h"
  151.36  #include "hosts.h"
   152.1 --- a/xen/drivers/scsi/aacraid/dpcsup.c	Tue Mar 23 09:33:07 2004 +0000
   152.2 +++ b/xen/drivers/scsi/aacraid/dpcsup.c	Tue Mar 23 09:48:06 2004 +0000
   152.3 @@ -29,16 +29,16 @@
   152.4   *
   152.5   */
   152.6  
   152.7 -#include <xeno/config.h>
   152.8 -#include <xeno/kernel.h>
   152.9 -#include <xeno/init.h>
  152.10 -#include <xeno/types.h>
  152.11 -#include <xeno/sched.h>
  152.12 -#include <xeno/pci.h>
  152.13 -#include <xeno/spinlock.h>
  152.14 -#include <xeno/slab.h>
  152.15 -/*#include <xeno/completion.h>*/
  152.16 -#include <xeno/blk.h>
  152.17 +#include <xen/config.h>
  152.18 +#include <xen/kernel.h>
  152.19 +#include <xen/init.h>
  152.20 +#include <xen/types.h>
  152.21 +#include <xen/sched.h>
  152.22 +#include <xen/pci.h>
  152.23 +#include <xen/spinlock.h>
  152.24 +#include <xen/slab.h>
  152.25 +/*#include <xen/completion.h>*/
  152.26 +#include <xen/blk.h>
  152.27  /*#include <asm/semaphore.h>*/
  152.28  #include "scsi.h"
  152.29  #include "hosts.h"
   153.1 --- a/xen/drivers/scsi/aacraid/linit.c	Tue Mar 23 09:33:07 2004 +0000
   153.2 +++ b/xen/drivers/scsi/aacraid/linit.c	Tue Mar 23 09:48:06 2004 +0000
   153.3 @@ -38,18 +38,18 @@
   153.4  #define AAC_DRIVER_VERSION		"1.1.2"
   153.5  #define AAC_DRIVER_BUILD_DATE		__DATE__ " " __TIME__
   153.6  
   153.7 -#include <xeno/module.h>
   153.8 -#include <xeno/config.h>
   153.9 -#include <xeno/kernel.h>
  153.10 -#include <xeno/init.h>
  153.11 -#include <xeno/types.h>
  153.12 -#include <xeno/sched.h>
  153.13 -#include <xeno/pci.h>
  153.14 -#include <xeno/spinlock.h>
  153.15 -#include <xeno/slab.h>
  153.16 -/*#include <xeno/completion.h>*/
  153.17 +#include <xen/module.h>
  153.18 +#include <xen/config.h>
  153.19 +#include <xen/kernel.h>
  153.20 +#include <xen/init.h>
  153.21 +#include <xen/types.h>
  153.22 +#include <xen/sched.h>
  153.23 +#include <xen/pci.h>
  153.24 +#include <xen/spinlock.h>
  153.25 +#include <xen/slab.h>
  153.26 +/*#include <xen/completion.h>*/
  153.27  /*#include <asm/semaphore.h>*/
  153.28 -#include <xeno/blk.h>
  153.29 +#include <xen/blk.h>
  153.30  #include "scsi.h"
  153.31  #include "hosts.h"
  153.32  
   154.1 --- a/xen/drivers/scsi/aacraid/rx.c	Tue Mar 23 09:33:07 2004 +0000
   154.2 +++ b/xen/drivers/scsi/aacraid/rx.c	Tue Mar 23 09:48:06 2004 +0000
   154.3 @@ -28,17 +28,17 @@
   154.4   *
   154.5   */
   154.6  
   154.7 -#include <xeno/config.h>
   154.8 -#include <xeno/kernel.h>
   154.9 -#include <xeno/init.h>
  154.10 -#include <xeno/types.h>
  154.11 -#include <xeno/sched.h>
  154.12 -#include <xeno/pci.h>
  154.13 -#include <xeno/spinlock.h>
  154.14 -#include <xeno/slab.h>
  154.15 -#include <xeno/blk.h>
  154.16 -#include <xeno/delay.h>
  154.17 -/*#include <xeno/completion.h>*/
  154.18 +#include <xen/config.h>
  154.19 +#include <xen/kernel.h>
  154.20 +#include <xen/init.h>
  154.21 +#include <xen/types.h>
  154.22 +#include <xen/sched.h>
  154.23 +#include <xen/pci.h>
  154.24 +#include <xen/spinlock.h>
  154.25 +#include <xen/slab.h>
  154.26 +#include <xen/blk.h>
  154.27 +#include <xen/delay.h>
  154.28 +/*#include <xen/completion.h>*/
  154.29  /*#include <asm/semaphore.h>*/
  154.30  #include "scsi.h"
  154.31  #include "hosts.h"
   155.1 --- a/xen/drivers/scsi/aacraid/sa.c	Tue Mar 23 09:33:07 2004 +0000
   155.2 +++ b/xen/drivers/scsi/aacraid/sa.c	Tue Mar 23 09:48:06 2004 +0000
   155.3 @@ -28,17 +28,17 @@
   155.4   *
   155.5   */
   155.6  
   155.7 -#include <xeno/config.h>
   155.8 -#include <xeno/kernel.h>
   155.9 -#include <xeno/init.h>
  155.10 -#include <xeno/types.h>
  155.11 -#include <xeno/sched.h>
  155.12 -#include <xeno/pci.h>
  155.13 -#include <xeno/spinlock.h>
  155.14 -#include <xeno/slab.h>
  155.15 -#include <xeno/blk.h>
  155.16 -#include <xeno/delay.h>
  155.17 -/*#include <xeno/completion.h>*/
  155.18 +#include <xen/config.h>
  155.19 +#include <xen/kernel.h>
  155.20 +#include <xen/init.h>
  155.21 +#include <xen/types.h>
  155.22 +#include <xen/sched.h>
  155.23 +#include <xen/pci.h>
  155.24 +#include <xen/spinlock.h>
  155.25 +#include <xen/slab.h>
  155.26 +#include <xen/blk.h>
  155.27 +#include <xen/delay.h>
  155.28 +/*#include <xen/completion.h>*/
  155.29  /*#include <asm/semaphore.h>*/
  155.30  #include "scsi.h"
  155.31  #include "hosts.h"
   156.1 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c	Tue Mar 23 09:33:07 2004 +0000
   156.2 +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c	Tue Mar 23 09:48:06 2004 +0000
   156.3 @@ -52,12 +52,12 @@
   156.4  #include "aic79xx_inline.h"
   156.5  
   156.6  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
   156.7 -#include <xeno/init.h>		/* __setup */
   156.8 +#include <xen/init.h>		/* __setup */
   156.9  #endif
  156.10  
  156.11  #include "../sd.h"		/* For geometry detection */
  156.12  
  156.13 -#include <xeno/mm.h>		/* For fetching system memory size */
  156.14 +#include <xen/mm.h>		/* For fetching system memory size */
  156.15  
  156.16  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
  156.17  /*
  156.18 @@ -648,8 +648,8 @@ ahd_runq_tasklet(unsigned long data)
  156.19  }
  156.20  
  156.21  /************************ Shutdown/halt/reboot hook ***************************/
  156.22 -#include <xeno/notifier.h>
  156.23 -#include <xeno/reboot.h>
  156.24 +#include <xen/notifier.h>
  156.25 +#include <xen/reboot.h>
  156.26  /* SAE: */
  156.27  /*
  156.28  static struct notifier_block ahd_linux_notifier = {
   157.1 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h	Tue Mar 23 09:33:07 2004 +0000
   157.2 +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h	Tue Mar 23 09:48:06 2004 +0000
   157.3 @@ -42,21 +42,21 @@
   157.4  #ifndef _AIC79XX_LINUX_H_
   157.5  #define _AIC79XX_LINUX_H_
   157.6  
   157.7 -#include <xeno/config.h>
   157.8 -#include <xeno/types.h>
   157.9 -#include <xeno/blk.h>
  157.10 -#include <xeno/blkdev.h>
  157.11 -#include <xeno/delay.h>
  157.12 -#include <xeno/ioport.h>
  157.13 -#include <xeno/pci.h>
  157.14 +#include <xen/config.h>
  157.15 +#include <xen/types.h>
  157.16 +#include <xen/blk.h>
  157.17 +#include <xen/blkdev.h>
  157.18 +#include <xen/delay.h>
  157.19 +#include <xen/ioport.h>
  157.20 +#include <xen/pci.h>
  157.21  /* SAE */
  157.22  #if XENO_KILLED
  157.23 -#include <xeno/version.h>
  157.24 +#include <xen/version.h>
  157.25  #endif
  157.26  #ifndef AHD_MODVERSION_FILE
  157.27  #define __NO_VERSION__
  157.28  #endif
  157.29 -#include <xeno/module.h>
  157.30 +#include <xen/module.h>
  157.31  #include <asm/byteorder.h>
  157.32  
  157.33  #ifndef KERNEL_VERSION
  157.34 @@ -67,11 +67,11 @@
  157.35  #define LINUX_VERSION_CODE KERNEL_VERSION(2,4,0)
  157.36  
  157.37  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
  157.38 -#include <xeno/interrupt.h> /* For tasklet support. */
  157.39 -#include <xeno/config.h>
  157.40 -#include <xeno/slab.h>
  157.41 +#include <xen/interrupt.h> /* For tasklet support. */
  157.42 +#include <xen/config.h>
  157.43 +#include <xen/slab.h>
  157.44  #else
  157.45 -#include <xeno/malloc.h>
  157.46 +#include <xen/malloc.h>
  157.47  #endif
  157.48  
  157.49  /* Core SCSI definitions */
  157.50 @@ -440,12 +440,12 @@ ahd_timer_reset(ahd_timer_t *timer, int 
  157.51  
  157.52  /***************************** SMP support ************************************/
  157.53  /* SAE */
  157.54 -#include <xeno/spinlock.h>
  157.55 +#include <xen/spinlock.h>
  157.56  /*
  157.57  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17)
  157.58 -#include <xeno/spinlock.h>
  157.59 +#include <xen/spinlock.h>
  157.60  #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,93)
  157.61 -#include <xeno/smp.h>
  157.62 +#include <xen/smp.h>
  157.63  #endif
  157.64  */
  157.65  
  157.66 @@ -1016,7 +1016,7 @@ void ahd_power_state_change(struct ahd_s
  157.67  #if defined(__sparc_v9__) || defined(__powerpc__)
  157.68  #error "PPC and Sparc platforms are only support under 2.1.92 and above"
  157.69  #endif
  157.70 -#include <xeno/bios32.h>
  157.71 +#include <xen/bios32.h>
  157.72  #endif
  157.73  
  157.74  int			 ahd_linux_pci_probe(Scsi_Host_Template *);
   158.1 --- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c	Tue Mar 23 09:33:07 2004 +0000
   158.2 +++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c	Tue Mar 23 09:48:06 2004 +0000
   158.3 @@ -125,19 +125,19 @@
   158.4   */
   158.5  //#define AHC_MODVERSION_FILE
   158.6  
   158.7 -#include <xeno/lib.h>
   158.8 -#include <xeno/string.h>
   158.9 +#include <xen/lib.h>
  158.10 +#include <xen/string.h>
  158.11  #include "aic7xxx_osm.h"
  158.12  #include "aic7xxx_inline.h"
  158.13  
  158.14  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
  158.15 -#include <xeno/init.h>		/* __setup */
  158.16 +#include <xen/init.h>		/* __setup */
  158.17  #endif
  158.18  
  158.19  #include "../sd.h"		/* For geometry detection */
  158.20  
  158.21 -#include <xeno/mm.h>		/* For fetching system memory size */
  158.22 -#include <xeno/blk.h>		/* For block_size() */
  158.23 +#include <xen/mm.h>		/* For fetching system memory size */
  158.24 +#include <xen/blk.h>		/* For block_size() */
  158.25  
  158.26  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
  158.27  /*
  158.28 @@ -718,8 +718,8 @@ ahc_runq_tasklet(unsigned long data)
  158.29  }
  158.30  
  158.31  /************************ Shutdown/halt/reboot hook ***************************/
  158.32 -#include <xeno/notifier.h>
  158.33 -#include <xeno/reboot.h>
  158.34 +#include <xen/notifier.h>
  158.35 +#include <xen/reboot.h>
  158.36  
  158.37  #if XENO_KILLED
  158.38  static struct notifier_block ahc_linux_notifier = {
  158.39 @@ -1141,7 +1141,7 @@ ahc_linux_detect(Scsi_Host_Template *tem
  158.40  		aic7xxx_setup(aic7xxx);
  158.41  	if (dummy_buffer[0] != 'P')
  158.42  		printf(KERN_WARNING
  158.43 -"aic7xxx: Please read the file /usr/src/xeno/drivers/scsi/README.aic7xxx\n"
  158.44 +"aic7xxx: Please read the file /usr/src/xen/drivers/scsi/README.aic7xxx\n"
  158.45  "aic7xxx: to see the proper way to specify options to the aic7xxx module\n"
  158.46  "aic7xxx: Specifically, don't use any commas when passing arguments to\n"
  158.47  "aic7xxx: insmod or else it might trash certain memory areas.\n");
   159.1 --- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.h	Tue Mar 23 09:33:07 2004 +0000
   159.2 +++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.h	Tue Mar 23 09:48:06 2004 +0000
   159.3 @@ -61,21 +61,21 @@
   159.4  
   159.5  #ifndef _AIC7XXX_LINUX_H_
   159.6  #define _AIC7XXX_LINUX_H_
   159.7 -#include <xeno/lib.h>
   159.8 -#include <xeno/string.h>
   159.9 -#include <xeno/types.h>
  159.10 -#include <xeno/blk.h>
  159.11 -#include <xeno/blkdev.h>
  159.12 -#include <xeno/delay.h>
  159.13 -#include <xeno/ioport.h>
  159.14 -#include <xeno/pci.h>
  159.15 -//#include <xeno/version.h>
  159.16 +#include <xen/lib.h>
  159.17 +#include <xen/string.h>
  159.18 +#include <xen/types.h>
  159.19 +#include <xen/blk.h>
  159.20 +#include <xen/blkdev.h>
  159.21 +#include <xen/delay.h>
  159.22 +#include <xen/ioport.h>
  159.23 +#include <xen/pci.h>
  159.24 +//#include <xen/version.h>
  159.25  #ifndef AHC_MODVERSION_FILE
  159.26  #define __NO_VERSION__
  159.27  #endif
  159.28 -#include <xeno/module.h>
  159.29 +#include <xen/module.h>
  159.30  #include <asm/byteorder.h>
  159.31 -#include <xeno/notifier.h>
  159.32 +#include <xen/notifier.h>
  159.33  
  159.34  #ifndef KERNEL_VERSION
  159.35  #define KERNEL_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
  159.36 @@ -84,11 +84,11 @@
  159.37  #define LINUX_VERSION_CODE KERNEL_VERSION(2,4,20)
  159.38  
  159.39  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
  159.40 -#include <xeno/interrupt.h> /* For tasklet support. */
  159.41 -#include <xeno/config.h>
  159.42 -#include <xeno/slab.h>
  159.43 +#include <xen/interrupt.h> /* For tasklet support. */
  159.44 +#include <xen/config.h>
  159.45 +#include <xen/slab.h>
  159.46  #else
  159.47 -#include <xeno/malloc.h>
  159.48 +#include <xen/malloc.h>
  159.49  #endif
  159.50  
  159.51  /* Core SCSI definitions */
  159.52 @@ -409,9 +409,9 @@ struct scsi_inquiry_data
  159.53  
  159.54  /* SMP support */
  159.55  //#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17)
  159.56 -#include <xeno/spinlock.h>
  159.57 +#include <xen/spinlock.h>
  159.58  //#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,93)
  159.59 -//#include <xeno/smp.h>
  159.60 +//#include <xen/smp.h>
  159.61  //#endif
  159.62  
  159.63  #define AIC7XXX_DRIVER_VERSION  "6.2.8"
  159.64 @@ -926,7 +926,7 @@ int			 aic7770_map_int(struct ahc_softc 
  159.65  #if defined(__sparc_v9__) || defined(__powerpc__)
  159.66  #error "PPC and Sparc platforms are only support under 2.1.92 and above"
  159.67  #endif
  159.68 -#include <xeno/bios32.h>
  159.69 +#include <xen/bios32.h>
  159.70  #endif
  159.71  
  159.72  int			 ahc_linux_pci_probe(Scsi_Host_Template *);
   160.1 --- a/xen/drivers/scsi/constants.c	Tue Mar 23 09:33:07 2004 +0000
   160.2 +++ b/xen/drivers/scsi/constants.c	Tue Mar 23 09:48:06 2004 +0000
   160.3 @@ -6,11 +6,11 @@
   160.4   */
   160.5  
   160.6  #define __NO_VERSION__
   160.7 -#include <xeno/module.h>
   160.8 +#include <xen/module.h>
   160.9  
  160.10 -#include <xeno/config.h>
  160.11 -#include <xeno/blk.h>
  160.12 -/*#include <xeno/kernel.h> */
  160.13 +#include <xen/config.h>
  160.14 +#include <xen/blk.h>
  160.15 +/*#include <xen/kernel.h> */
  160.16  #include "scsi.h"
  160.17  #include "hosts.h"
  160.18  
   161.1 --- a/xen/drivers/scsi/hosts.c	Tue Mar 23 09:33:07 2004 +0000
   161.2 +++ b/xen/drivers/scsi/hosts.c	Tue Mar 23 09:48:06 2004 +0000
   161.3 @@ -25,17 +25,17 @@
   161.4   */
   161.5  
   161.6  #define __NO_VERSION__
   161.7 -#include <xeno/module.h>
   161.8 -#include <xeno/blk.h>
   161.9 -/*  #include <xeno/kernel.h> */
  161.10 -/*  #include <xeno/string.h> */
  161.11 -/*  #include <xeno/mm.h> */
  161.12 -/*  #include <xeno/proc_fs.h> */
  161.13 -#include <xeno/init.h>
  161.14 +#include <xen/module.h>
  161.15 +#include <xen/blk.h>
  161.16 +/*  #include <xen/kernel.h> */
  161.17 +/*  #include <xen/string.h> */
  161.18 +/*  #include <xen/mm.h> */
  161.19 +/*  #include <xen/proc_fs.h> */
  161.20 +#include <xen/init.h>
  161.21  
  161.22  #define __KERNEL_SYSCALLS__
  161.23  
  161.24 -/* #include <xeno/unistd.h> */
  161.25 +/* #include <xen/unistd.h> */
  161.26  
  161.27  #include "scsi.h"
  161.28  #include "hosts.h"
   162.1 --- a/xen/drivers/scsi/hosts.h	Tue Mar 23 09:33:07 2004 +0000
   162.2 +++ b/xen/drivers/scsi/hosts.h	Tue Mar 23 09:48:06 2004 +0000
   162.3 @@ -25,9 +25,9 @@
   162.4      $Header: /vger/u4/cvs/linux/drivers/scsi/hosts.h,v 1.6 1997/01/19 23:07:13 davem Exp $
   162.5  */
   162.6  
   162.7 -#include <xeno/config.h>
   162.8 -/*#include <xeno/proc_fs.h>*/
   162.9 -#include <xeno/pci.h>
  162.10 +#include <xen/config.h>
  162.11 +/*#include <xen/proc_fs.h>*/
  162.12 +#include <xen/pci.h>
  162.13  
  162.14  /* It is senseless to set SG_ALL any higher than this - the performance
  162.15   *  does not get any better, and it wastes memory
   163.1 --- a/xen/drivers/scsi/megaraid.c	Tue Mar 23 09:33:07 2004 +0000
   163.2 +++ b/xen/drivers/scsi/megaraid.c	Tue Mar 23 09:48:06 2004 +0000
   163.3 @@ -515,37 +515,37 @@
   163.4   *===================================================================*/
   163.5  
   163.6  
   163.7 -#include <xeno/config.h>
   163.8 -#include <xeno/version.h>
   163.9 -#include <xeno/module.h>
  163.10 -#include <xeno/types.h>
  163.11 -#include <xeno/errno.h>
  163.12 -#include <xeno/string.h>
  163.13 -#include <xeno/lib.h>
  163.14 -#include <xeno/kernel.h>
  163.15 -#include <xeno/ioport.h>
  163.16 -//#include <xeno/fcntl.h>
  163.17 -#include <xeno/delay.h>
  163.18 -#include <xeno/pci.h>
  163.19 -//#include <xeno/proc_fs.h>
  163.20 -#include <xeno/blk.h>
  163.21 -//#include <xeno/wait.h>
  163.22 -#include <xeno/tqueue.h>
  163.23 -#include <xeno/interrupt.h>
  163.24 -#include <xeno/mm.h>
  163.25 +#include <xen/config.h>
  163.26 +#include <xen/version.h>
  163.27 +#include <xen/module.h>
  163.28 +#include <xen/types.h>
  163.29 +#include <xen/errno.h>
  163.30 +#include <xen/string.h>
  163.31 +#include <xen/lib.h>
  163.32 +#include <xen/kernel.h>
  163.33 +#include <xen/ioport.h>
  163.34 +//#include <xen/fcntl.h>
  163.35 +#include <xen/delay.h>
  163.36 +#include <xen/pci.h>
  163.37 +//#include <xen/proc_fs.h>
  163.38 +#include <xen/blk.h>
  163.39 +//#include <xen/wait.h>
  163.40 +#include <xen/tqueue.h>
  163.41 +#include <xen/interrupt.h>
  163.42 +#include <xen/mm.h>
  163.43  //#include <asm/pgtable.h>
  163.44  
  163.45  #include <asm/ioctl.h>
  163.46 -#include <xeno/sched.h>
  163.47 -//#include <xeno/stat.h>
  163.48 -#include <xeno/slab.h>	/* for kmalloc() */
  163.49 +#include <xen/sched.h>
  163.50 +//#include <xen/stat.h>
  163.51 +#include <xen/slab.h>	/* for kmalloc() */
  163.52  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)	/* 0x20100 */
  163.53 -#include <xeno/bios32.h>
  163.54 +#include <xen/bios32.h>
  163.55  #else
  163.56  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)	/* 0x20300 */
  163.57  #include <asm/spinlock.h>
  163.58  #else
  163.59 -#include <xeno/spinlock.h>
  163.60 +#include <xen/spinlock.h>
  163.61  #endif
  163.62  #endif
  163.63  
  163.64 @@ -559,9 +559,9 @@
  163.65  /*
  163.66   * These header files are required for Shutdown Notification routines
  163.67   */
  163.68 -#include <xeno/notifier.h>
  163.69 -#include <xeno/reboot.h>
  163.70 -#include <xeno/init.h>
  163.71 +#include <xen/notifier.h>
  163.72 +#include <xen/reboot.h>
  163.73 +#include <xen/init.h>
  163.74  
  163.75  #include "sd.h"
  163.76  #include "scsi.h"
  163.77 @@ -599,7 +599,7 @@ static void WROUTDOOR (mega_host_config 
  163.78  }
  163.79  
  163.80  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)	/* 0x020200 */
  163.81 -#include <xeno/smp.h>
  163.82 +#include <xen/smp.h>
  163.83  #define cpuid smp_processor_id()
  163.84  #endif
  163.85  
   164.1 --- a/xen/drivers/scsi/megaraid.h	Tue Mar 23 09:33:07 2004 +0000
   164.2 +++ b/xen/drivers/scsi/megaraid.h	Tue Mar 23 09:48:06 2004 +0000
   164.3 @@ -1,7 +1,7 @@
   164.4  #ifndef __MEGARAID_H__
   164.5  #define __MEGARAID_H__
   164.6  
   164.7 -#include <xeno/version.h>
   164.8 +#include <xen/version.h>
   164.9  
  164.10  /*
  164.11   * For state flag. Do not use LSB(8 bits) which are
   165.1 --- a/xen/drivers/scsi/scsi.c	Tue Mar 23 09:33:07 2004 +0000
   165.2 +++ b/xen/drivers/scsi/scsi.c	Tue Mar 23 09:48:06 2004 +0000
   165.3 @@ -39,30 +39,30 @@
   165.4  #define REVISION	"Revision: 1.00"
   165.5  #define VERSION		"Id: scsi.c 1.00 2000/09/26"
   165.6  
   165.7 -#include <xeno/config.h>
   165.8 -#include <xeno/module.h>
   165.9 +#include <xen/config.h>
  165.10 +#include <xen/module.h>
  165.11  
  165.12 -#include <xeno/sched.h>
  165.13 -#include <xeno/timer.h>
  165.14 -#include <xeno/lib.h>
  165.15 -#include <xeno/slab.h>
  165.16 -#include <xeno/ioport.h>
  165.17 -/*#include <xeno/stat.h>*/
  165.18 -#include <xeno/blk.h>
  165.19 -#include <xeno/interrupt.h>
  165.20 -#include <xeno/delay.h>
  165.21 -#include <xeno/init.h>
  165.22 -/*#include <xeno/smp_lock.h>*/
  165.23 -/*#include <xeno/completion.h>*/
  165.24 +#include <xen/sched.h>
  165.25 +#include <xen/timer.h>
  165.26 +#include <xen/lib.h>
  165.27 +#include <xen/slab.h>
  165.28 +#include <xen/ioport.h>
  165.29 +/*#include <xen/stat.h>*/
  165.30 +#include <xen/blk.h>
  165.31 +#include <xen/interrupt.h>
  165.32 +#include <xen/delay.h>
  165.33 +#include <xen/init.h>
  165.34 +/*#include <xen/smp_lock.h>*/
  165.35 +/*#include <xen/completion.h>*/
  165.36  
  165.37 -/* for xeno scsi_probe() stuff... maybe punt somewhere else? */
  165.38 +/* for xen scsi_probe() stuff... maybe punt somewhere else? */
  165.39  #include <hypervisor-ifs/block.h>
  165.40 -#include <xeno/blkdev.h>
  165.41 +#include <xen/blkdev.h>
  165.42  
  165.43  #define __KERNEL_SYSCALLS__
  165.44  
  165.45 -/*#include <xeno/unistd.h>*/
  165.46 -#include <xeno/spinlock.h>
  165.47 +/*#include <xen/unistd.h>*/
  165.48 +#include <xen/spinlock.h>
  165.49  
  165.50  #include <asm/system.h>
  165.51  #include <asm/irq.h>
  165.52 @@ -74,7 +74,7 @@
  165.53  #include "constants.h"
  165.54  
  165.55  #ifdef CONFIG_KMOD
  165.56 -#include <xeno/kmod.h>
  165.57 +#include <xen/kmod.h>
  165.58  #endif
  165.59  
  165.60  #undef USE_STATIC_SCSI_MEMORY
   166.1 --- a/xen/drivers/scsi/scsi.h	Tue Mar 23 09:33:07 2004 +0000
   166.2 +++ b/xen/drivers/scsi/scsi.h	Tue Mar 23 09:48:06 2004 +0000
   166.3 @@ -15,9 +15,9 @@
   166.4  #ifndef _SCSI_H
   166.5  #define _SCSI_H
   166.6  
   166.7 -#include <xeno/config.h>	/* for CONFIG_SCSI_LOGGING */
   166.8 -#include <xeno/timer.h>
   166.9 -/*#include <xeno/proc_fs.h>*/
  166.10 +#include <xen/config.h>	/* for CONFIG_SCSI_LOGGING */
  166.11 +#include <xen/timer.h>
  166.12 +/*#include <xen/proc_fs.h>*/
  166.13  
  166.14  /*
  166.15   * Some of the public constants are being moved to this file.
  166.16 @@ -25,7 +25,7 @@
  166.17   */
  166.18  #include <scsi/scsi.h>
  166.19  
  166.20 -/*#include <xeno/random.h>*/
  166.21 +/*#include <xen/random.h>*/
  166.22  
  166.23  #include <asm/hardirq.h>
  166.24  #include <asm/scatterlist.h>
  166.25 @@ -44,7 +44,7 @@
  166.26  #define SCSI_DATA_NONE          3
  166.27  
  166.28  #ifdef CONFIG_PCI
  166.29 -#include <xeno/pci.h>
  166.30 +#include <xen/pci.h>
  166.31  #if ((SCSI_DATA_UNKNOWN == PCI_DMA_BIDIRECTIONAL) && (SCSI_DATA_WRITE == PCI_DMA_TODEVICE) && (SCSI_DATA_READ == PCI_DMA_FROMDEVICE) && (SCSI_DATA_NONE == PCI_DMA_NONE))
  166.32  #define scsi_to_pci_dma_dir(scsi_dir)	((int)(scsi_dir))
  166.33  #else
   167.1 --- a/xen/drivers/scsi/scsi_dma.c	Tue Mar 23 09:33:07 2004 +0000
   167.2 +++ b/xen/drivers/scsi/scsi_dma.c	Tue Mar 23 09:48:06 2004 +0000
   167.3 @@ -6,9 +6,9 @@
   167.4   */
   167.5  
   167.6  #define __NO_VERSION__
   167.7 -#include <xeno/config.h>
   167.8 -#include <xeno/module.h>
   167.9 -#include <xeno/blk.h>
  167.10 +#include <xen/config.h>
  167.11 +#include <xen/module.h>
  167.12 +#include <xen/blk.h>
  167.13  
  167.14  
  167.15  #include "scsi.h"
  167.16 @@ -16,7 +16,7 @@
  167.17  #include "constants.h"
  167.18  
  167.19  #ifdef CONFIG_KMOD
  167.20 -#include <xeno/kmod.h>
  167.21 +#include <xen/kmod.h>
  167.22  #endif
  167.23  
  167.24  /*
   168.1 --- a/xen/drivers/scsi/scsi_error.c	Tue Mar 23 09:33:07 2004 +0000
   168.2 +++ b/xen/drivers/scsi/scsi_error.c	Tue Mar 23 09:48:06 2004 +0000
   168.3 @@ -9,23 +9,23 @@
   168.4   */
   168.5  
   168.6  #define __NO_VERSION__
   168.7 -#include <xeno/module.h>
   168.8 +#include <xen/module.h>
   168.9  
  168.10 -#include <xeno/sched.h>
  168.11 -#include <xeno/timer.h>
  168.12 -/*#include <xeno/string.h>*/
  168.13 -#include <xeno/slab.h>
  168.14 -#include <xeno/ioport.h>
  168.15 -#include <xeno/kernel.h>
  168.16 -/*#include <xeno/stat.h>*/
  168.17 -#include <xeno/blk.h>
  168.18 -#include <xeno/interrupt.h>
  168.19 -#include <xeno/delay.h>
  168.20 -/*#include <xeno/smp_lock.h>*/
  168.21 +#include <xen/sched.h>
  168.22 +#include <xen/timer.h>
  168.23 +/*#include <xen/string.h>*/
  168.24 +#include <xen/slab.h>
  168.25 +#include <xen/ioport.h>
  168.26 +#include <xen/kernel.h>
  168.27 +/*#include <xen/stat.h>*/
  168.28 +#include <xen/blk.h>
  168.29 +#include <xen/interrupt.h>
  168.30 +#include <xen/delay.h>
  168.31 +/*#include <xen/smp_lock.h>*/
  168.32  
  168.33  #define __KERNEL_SYSCALLS__
  168.34  
  168.35 -/*#include <xeno/unistd.h>*/
  168.36 +/*#include <xen/unistd.h>*/
  168.37  
  168.38  #include <asm/system.h>
  168.39  #include <asm/irq.h>
   169.1 --- a/xen/drivers/scsi/scsi_ioctl.c	Tue Mar 23 09:33:07 2004 +0000
   169.2 +++ b/xen/drivers/scsi/scsi_ioctl.c	Tue Mar 23 09:48:06 2004 +0000
   169.3 @@ -5,21 +5,21 @@
   169.4   *   for the ones that remain
   169.5   */
   169.6  #define __NO_VERSION__
   169.7 -#include <xeno/module.h>
   169.8 +#include <xen/module.h>
   169.9  
  169.10  #include <asm/io.h>
  169.11  #include <asm/uaccess.h>
  169.12  #include <asm/system.h>
  169.13  #include <asm/page.h>
  169.14  
  169.15 -/*  #include <xeno/interrupt.h> */
  169.16 -/*  #include <xeno/errno.h> */
  169.17 -/*  #include <xeno/kernel.h> */
  169.18 -#include <xeno/sched.h>
  169.19 -/*  #include <xeno/mm.h> */
  169.20 -/*  #include <xeno/string.h> */
  169.21 +/*  #include <xen/interrupt.h> */
  169.22 +/*  #include <xen/errno.h> */
  169.23 +/*  #include <xen/kernel.h> */
  169.24 +#include <xen/sched.h>
  169.25 +/*  #include <xen/mm.h> */
  169.26 +/*  #include <xen/string.h> */
  169.27  
  169.28 -#include <xeno/blk.h>
  169.29 +#include <xen/blk.h>
  169.30  #include "scsi.h"
  169.31  #include "hosts.h"
  169.32  #include <scsi/scsi_ioctl.h>
   170.1 --- a/xen/drivers/scsi/scsi_lib.c	Tue Mar 23 09:33:07 2004 +0000
   170.2 +++ b/xen/drivers/scsi/scsi_lib.c	Tue Mar 23 09:48:06 2004 +0000
   170.3 @@ -18,25 +18,25 @@
   170.4   */
   170.5  
   170.6  #define __NO_VERSION__
   170.7 -#include <xeno/module.h>
   170.8 +#include <xen/module.h>
   170.9  
  170.10 -#include <xeno/sched.h>
  170.11 -#include <xeno/timer.h>
  170.12 -/*  #include <xeno/string.h> */
  170.13 -/*  #include <xeno/slab.h> */
  170.14 -/*  #include <xeno/ioport.h> */
  170.15 -/*  #include <xeno/kernel.h> */
  170.16 -/*  #include <xeno/stat.h> */
  170.17 -#include <xeno/blk.h>
  170.18 -/*  #include <xeno/interrupt.h> */
  170.19 -/*  #include <xeno/delay.h> */
  170.20 -/*  #include <xeno/smp_lock.h> */
  170.21 -/*  #include <xeno/completion.h> */
  170.22 +#include <xen/sched.h>
  170.23 +#include <xen/timer.h>
  170.24 +/*  #include <xen/string.h> */
  170.25 +/*  #include <xen/slab.h> */
  170.26 +/*  #include <xen/ioport.h> */
  170.27 +/*  #include <xen/kernel.h> */
  170.28 +/*  #include <xen/stat.h> */
  170.29 +#include <xen/blk.h>
  170.30 +/*  #include <xen/interrupt.h> */
  170.31 +/*  #include <xen/delay.h> */
  170.32 +/*  #include <xen/smp_lock.h> */
  170.33 +/*  #include <xen/completion.h> */
  170.34  
  170.35  
  170.36  #define __KERNEL_SYSCALLS__
  170.37  
  170.38 -/* #include <xeno/unistd.h> */
  170.39 +/* #include <xen/unistd.h> */
  170.40  
  170.41  #include <asm/system.h>
  170.42  #include <asm/irq.h>
   171.1 --- a/xen/drivers/scsi/scsi_merge.c	Tue Mar 23 09:33:07 2004 +0000
   171.2 +++ b/xen/drivers/scsi/scsi_merge.c	Tue Mar 23 09:48:06 2004 +0000
   171.3 @@ -33,25 +33,25 @@
   171.4   */
   171.5  
   171.6  #define __NO_VERSION__
   171.7 -#include <xeno/config.h>
   171.8 -#include <xeno/module.h>
   171.9 +#include <xen/config.h>
  171.10 +#include <xen/module.h>
  171.11  
  171.12 -#include <xeno/sched.h>
  171.13 -#include <xeno/timer.h>
  171.14 -/*  #include <xeno/string.h> */
  171.15 -/*  #include <xeno/slab.h> */
  171.16 -/*  #include <xeno/ioport.h> */
  171.17 -/*  #include <xeno/kernel.h> */
  171.18 -/*  #include <xeno/stat.h> */
  171.19 -#include <xeno/blk.h>
  171.20 -/*  #include <xeno/interrupt.h> */
  171.21 -/*  #include <xeno/delay.h> */
  171.22 -/*  #include <xeno/smp_lock.h> */
  171.23 +#include <xen/sched.h>
  171.24 +#include <xen/timer.h>
  171.25 +/*  #include <xen/string.h> */
  171.26 +/*  #include <xen/slab.h> */
  171.27 +/*  #include <xen/ioport.h> */
  171.28 +/*  #include <xen/kernel.h> */
  171.29 +/*  #include <xen/stat.h> */
  171.30 +#include <xen/blk.h>
  171.31 +/*  #include <xen/interrupt.h> */
  171.32 +/*  #include <xen/delay.h> */
  171.33 +/*  #include <xen/smp_lock.h> */
  171.34  
  171.35  
  171.36  #define __KERNEL_SYSCALLS__
  171.37  
  171.38 -/*  #include <xeno/unistd.h> */
  171.39 +/*  #include <xen/unistd.h> */
  171.40  
  171.41  #include <asm/system.h>
  171.42  #include <asm/irq.h>
   172.1 --- a/xen/drivers/scsi/scsi_module.c.inc	Tue Mar 23 09:33:07 2004 +0000
   172.2 +++ b/xen/drivers/scsi/scsi_module.c.inc	Tue Mar 23 09:48:06 2004 +0000
   172.3 @@ -29,8 +29,8 @@
   172.4   * scsi_register.
   172.5   */
   172.6  
   172.7 -#include <xeno/module.h>
   172.8 -#include <xeno/init.h>
   172.9 +#include <xen/module.h>
  172.10 +#include <xen/init.h>
  172.11  
  172.12  extern int scsi_register_module(int, void *);
  172.13  extern int scsi_unregister_module(int, void *);
   173.1 --- a/xen/drivers/scsi/scsi_obsolete.c	Tue Mar 23 09:33:07 2004 +0000
   173.2 +++ b/xen/drivers/scsi/scsi_obsolete.c	Tue Mar 23 09:48:06 2004 +0000
   173.3 @@ -47,18 +47,18 @@
   173.4   */
   173.5  
   173.6  #define __NO_VERSION__
   173.7 -#include <xeno/module.h>
   173.8 +#include <xen/module.h>
   173.9  
  173.10 -#include <xeno/sched.h>
  173.11 -#include <xeno/timer.h>
  173.12 -#include <xeno/string.h>
  173.13 -#include <xeno/slab.h>
  173.14 -#include <xeno/ioport.h>
  173.15 -#include <xeno/kernel.h>
  173.16 -/*#include <xeno/stat.h>*/
  173.17 -#include <xeno/blk.h>
  173.18 -#include <xeno/interrupt.h>
  173.19 -#include <xeno/delay.h>
  173.20 +#include <xen/sched.h>
  173.21 +#include <xen/timer.h>
  173.22 +#include <xen/string.h>
  173.23 +#include <xen/slab.h>
  173.24 +#include <xen/ioport.h>
  173.25 +#include <xen/kernel.h>
  173.26 +/*#include <xen/stat.h>*/
  173.27 +#include <xen/blk.h>
  173.28 +#include <xen/interrupt.h>
  173.29 +#include <xen/delay.h>
  173.30  
  173.31  #include <asm/system.h>
  173.32  #include <asm/irq.h>
   174.1 --- a/xen/drivers/scsi/scsi_proc.c	Tue Mar 23 09:33:07 2004 +0000
   174.2 +++ b/xen/drivers/scsi/scsi_proc.c	Tue Mar 23 09:48:06 2004 +0000
   174.3 @@ -16,17 +16,17 @@
   174.4   * Michael A. Griffith <grif@acm.org>
   174.5   */
   174.6  
   174.7 -#include <xeno/config.h>	/* for CONFIG_PROC_FS */
   174.8 +#include <xen/config.h>	/* for CONFIG_PROC_FS */
   174.9  #define __NO_VERSION__
  174.10 -#include <xeno/module.h>
  174.11 +#include <xen/module.h>
  174.12  
  174.13 -/*  #include <xeno/string.h> */
  174.14 -/*  #include <xeno/mm.h> */
  174.15 -/*  #include <xeno/slab.h> */
  174.16 -/*  #include <xeno/proc_fs.h> */
  174.17 -/*  #include <xeno/errno.h> */
  174.18 -/*  #include <xeno/stat.h> */
  174.19 -#include <xeno/blk.h>
  174.20 +/*  #include <xen/string.h> */
  174.21 +/*  #include <xen/mm.h> */
  174.22 +/*  #include <xen/slab.h> */
  174.23 +/*  #include <xen/proc_fs.h> */
  174.24 +/*  #include <xen/errno.h> */
  174.25 +/*  #include <xen/stat.h> */
  174.26 +#include <xen/blk.h>
  174.27  
  174.28  #include <asm/uaccess.h>
  174.29  
   175.1 --- a/xen/drivers/scsi/scsi_queue.c	Tue Mar 23 09:33:07 2004 +0000
   175.2 +++ b/xen/drivers/scsi/scsi_queue.c	Tue Mar 23 09:48:06 2004 +0000
   175.3 @@ -11,23 +11,23 @@
   175.4   */
   175.5  
   175.6  #define __NO_VERSION__
   175.7 -#include <xeno/module.h>
   175.8 +#include <xen/module.h>
   175.9  
  175.10 -#include <xeno/sched.h>
  175.11 -#include <xeno/timer.h>
  175.12 -/*  #include <xeno/string.h> */
  175.13 -/*  #include <xeno/slab.h> */
  175.14 -/*  #include <xeno/ioport.h> */
  175.15 -/*  #include <xeno/kernel.h> */
  175.16 -/*  #include <xeno/stat.h> */
  175.17 -#include <xeno/blk.h>
  175.18 -/*  #include <xeno/interrupt.h> */
  175.19 -/*  #include <xeno/delay.h> */
  175.20 -/*  #include <xeno/smp_lock.h> */
  175.21 +#include <xen/sched.h>
  175.22 +#include <xen/timer.h>
  175.23 +/*  #include <xen/string.h> */
  175.24 +/*  #include <xen/slab.h> */
  175.25 +/*  #include <xen/ioport.h> */
  175.26 +/*  #include <xen/kernel.h> */
  175.27 +/*  #include <xen/stat.h> */
  175.28 +#include <xen/blk.h>
  175.29 +/*  #include <xen/interrupt.h> */
  175.30 +/*  #include <xen/delay.h> */
  175.31 +/*  #include <xen/smp_lock.h> */
  175.32  
  175.33  #define __KERNEL_SYSCALLS__
  175.34  
  175.35 -/*#include <xeno/unistd.h>*/
  175.36 +/*#include <xen/unistd.h>*/
  175.37  
  175.38  #include <asm/system.h>
  175.39  #include <asm/irq.h>
   176.1 --- a/xen/drivers/scsi/scsi_scan.c	Tue Mar 23 09:33:07 2004 +0000
   176.2 +++ b/xen/drivers/scsi/scsi_scan.c	Tue Mar 23 09:48:06 2004 +0000
   176.3 @@ -9,18 +9,18 @@
   176.4   */
   176.5  
   176.6  #define __NO_VERSION__
   176.7 -#include <xeno/config.h>
   176.8 -#include <xeno/module.h>
   176.9 -#include <xeno/init.h>
  176.10 +#include <xen/config.h>
  176.11 +#include <xen/module.h>
  176.12 +#include <xen/init.h>
  176.13  
  176.14 -#include <xeno/blk.h>
  176.15 +#include <xen/blk.h>
  176.16  
  176.17  #include "scsi.h"
  176.18  #include "hosts.h"
  176.19  #include "constants.h"
  176.20  
  176.21  #ifdef CONFIG_KMOD
  176.22 -#include <xeno/kmod.h>
  176.23 +#include <xen/kmod.h>
  176.24  #endif
  176.25  
  176.26  /* 
   177.1 --- a/xen/drivers/scsi/scsi_syms.c	Tue Mar 23 09:33:07 2004 +0000
   177.2 +++ b/xen/drivers/scsi/scsi_syms.c	Tue Mar 23 09:48:06 2004 +0000
   177.3 @@ -3,17 +3,17 @@
   177.4   * a module.
   177.5   */
   177.6  #define __NO_VERSION__
   177.7 -#include <xeno/config.h>
   177.8 -#include <xeno/module.h>
   177.9 +#include <xen/config.h>
  177.10 +#include <xen/module.h>
  177.11  
  177.12 -#include <xeno/sched.h>
  177.13 -#include <xeno/timer.h>
  177.14 -/*  #include <xeno/string.h> */
  177.15 -/*  #include <xeno/slab.h> */
  177.16 -/*  #include <xeno/ioport.h> */
  177.17 -/*  #include <xeno/kernel.h> */
  177.18 -#include <xeno/blk.h>
  177.19 -/* #include <xeno/fs.h> */
  177.20 +#include <xen/sched.h>
  177.21 +#include <xen/timer.h>
  177.22 +/*  #include <xen/string.h> */
  177.23 +/*  #include <xen/slab.h> */
  177.24 +/*  #include <xen/ioport.h> */
  177.25 +/*  #include <xen/kernel.h> */
  177.26 +#include <xen/blk.h>
  177.27 +/* #include <xen/fs.h> */
  177.28  
  177.29  #include <asm/system.h>
  177.30  #include <asm/irq.h>
   178.1 --- a/xen/drivers/scsi/scsicam.c	Tue Mar 23 09:33:07 2004 +0000
   178.2 +++ b/xen/drivers/scsi/scsicam.c	Tue Mar 23 09:48:06 2004 +0000
   178.3 @@ -12,14 +12,14 @@
   178.4  
   178.5  #define __NO_VERSION__
   178.6  
   178.7 -#include <xeno/config.h>
   178.8 -#include <xeno/module.h>
   178.9 +#include <xen/config.h>
  178.10 +#include <xen/module.h>
  178.11  
  178.12  
  178.13 -/*#include <xeno/fs.h>*/
  178.14 -/*#include <xeno/genhd.h>*/
  178.15 -#include <xeno/blk.h>
  178.16 -/*#include <xeno/kernel.h>*/
  178.17 +/*#include <xen/fs.h>*/
  178.18 +/*#include <xen/genhd.h>*/
  178.19 +#include <xen/blk.h>
  178.20 +/*#include <xen/kernel.h>*/
  178.21  #include <asm/unaligned.h>
  178.22  #include "scsi.h"
  178.23  #include "hosts.h"
   179.1 --- a/xen/drivers/scsi/sd.c	Tue Mar 23 09:33:07 2004 +0000
   179.2 +++ b/xen/drivers/scsi/sd.c	Tue Mar 23 09:48:06 2004 +0000
   179.3 @@ -30,19 +30,19 @@
   179.4   *       Fix problem where removable media could be ejected after sd_open.
   179.5   */
   179.6  
   179.7 -#include <xeno/config.h>
   179.8 -#include <xeno/module.h>
   179.9 -#include <xeno/sched.h>
  179.10 -#include <xeno/hdreg.h>
  179.11 -#include <xeno/init.h>
  179.12 +#include <xen/config.h>
  179.13 +#include <xen/module.h>
  179.14 +#include <xen/sched.h>
  179.15 +#include <xen/hdreg.h>
  179.16 +#include <xen/init.h>
  179.17  
  179.18  #include <asm/uaccess.h>
  179.19  #include <asm/system.h>
  179.20  #include <asm/io.h>
  179.21  
  179.22  #define MAJOR_NR SCSI_DISK0_MAJOR
  179.23 -#include <xeno/blk.h>
  179.24 -#include <xeno/blkpg.h>
  179.25 +#include <xen/blk.h>
  179.26 +#include <xen/blkpg.h>
  179.27  #include "scsi.h"
  179.28  #include "hosts.h"
  179.29  #include "sd.h"
  179.30 @@ -50,7 +50,7 @@
  179.31  #include "constants.h"
  179.32  #include <scsi/scsicam.h>	/* must follow "hosts.h" */
  179.33  
  179.34 -#include <xeno/genhd.h>
  179.35 +#include <xen/genhd.h>
  179.36  
  179.37  #include <asm/domain_page.h>    /* SMH: for [un_]map_domain_mem() */
  179.38  
  179.39 @@ -1306,7 +1306,7 @@ static void sd_finish()
  179.40  ** add the scsi block devices for this domain to a xen_disk_info_t; 
  179.41  ** we assume xdi->count points to the first unused place in the array. 
  179.42  **
  179.43 -** XXX SMH: this is a rather gross 'probe' function to allow xeno world 
  179.44 +** XXX SMH: this is a rather gross 'probe' function to allow xen world 
  179.45  ** to grope us; this should really not be in the disk-specific code as 
  179.46  ** it should report tapes, CDs, etc. But for now this looks like the 
  179.47  ** easiest place to hook it in :-( 
   180.1 --- a/xen/drivers/scsi/sd.h	Tue Mar 23 09:33:07 2004 +0000
   180.2 +++ b/xen/drivers/scsi/sd.h	Tue Mar 23 09:48:06 2004 +0000
   180.3 @@ -20,7 +20,7 @@
   180.4  #endif
   180.5  
   180.6  #ifndef _GENDISK_H
   180.7 -#include <xeno/genhd.h>
   180.8 +#include <xen/genhd.h>
   180.9  #endif
  180.10  
  180.11  typedef struct scsi_disk {
   181.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h	Tue Mar 23 09:33:07 2004 +0000
   181.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h	Tue Mar 23 09:48:06 2004 +0000
   181.3 @@ -54,9 +54,9 @@
   181.4  #define SYM53C8XX_H
   181.5  
   181.6  #if !defined(LINUX_VERSION_CODE)
   181.7 -#include <xeno/version.h>
   181.8 +#include <xen/version.h>
   181.9  #endif
  181.10 -#include <xeno/config.h>
  181.11 +#include <xen/config.h>
  181.12  
  181.13  /*
  181.14   *  Compatibility with ncr53c8xx and sym53c8xx configuration options.
   182.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Tue Mar 23 09:33:07 2004 +0000
   182.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Tue Mar 23 09:48:06 2004 +0000
   182.3 @@ -51,7 +51,7 @@
   182.4   */
   182.5  #define SYM_GLUE_C
   182.6  
   182.7 -#include <xeno/module.h>
   182.8 +#include <xen/module.h>
   182.9  #include "sym_glue.h"
  182.10  
  182.11  #define NAME53C		"sym53c"
   183.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.h	Tue Mar 23 09:33:07 2004 +0000
   183.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.h	Tue Mar 23 09:48:06 2004 +0000
   183.3 @@ -58,7 +58,7 @@
   183.4  #endif
   183.5  
   183.6  #define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s))
   183.7 -#include <xeno/version.h>
   183.8 +#include <xen/version.h>
   183.9  #if	LINUX_VERSION_CODE < LinuxVersionCode(2, 2, 0)
  183.10  #error	"This driver requires a kernel version not lower than 2.2.0"
  183.11  #endif
  183.12 @@ -67,36 +67,36 @@
  183.13  #include <asm/io.h>
  183.14  #include <asm/system.h>
  183.15  #if LINUX_VERSION_CODE >= LinuxVersionCode(2,3,17)
  183.16 -#include <xeno/spinlock.h>
  183.17 +#include <xen/spinlock.h>
  183.18  #else
  183.19  #include <asm/spinlock.h>
  183.20  #endif
  183.21 -#include <xeno/delay.h>
  183.22 +#include <xen/delay.h>
  183.23  
  183.24  /* SAE: Not here... */
  183.25  #ifdef XENO_KILLED
  183.26 -#include <xeno/signal.h>
  183.27 +#include <xen/signal.h>
  183.28  #endif
  183.29  
  183.30 -#include <xeno/sched.h>
  183.31 -#include <xeno/errno.h>
  183.32 -#include <xeno/pci.h>
  183.33 -#include <xeno/string.h>
  183.34 -#include <xeno/mm.h>
  183.35 -#include <xeno/ioport.h>
  183.36 -#include <xeno/time.h>
  183.37 -#include <xeno/timer.h>
  183.38 +#include <xen/sched.h>
  183.39 +#include <xen/errno.h>
  183.40 +#include <xen/pci.h>
  183.41 +#include <xen/string.h>
  183.42 +#include <xen/mm.h>
  183.43 +#include <xen/ioport.h>
  183.44 +#include <xen/time.h>
  183.45 +#include <xen/timer.h>
  183.46  /* SAE */
  183.47  #ifdef XENO_KILLED
  183.48 -#include <xeno/stat.h>
  183.49 +#include <xen/stat.h>
  183.50  #endif
  183.51  
  183.52 -#include <xeno/blk.h>
  183.53 +#include <xen/blk.h>
  183.54  
  183.55  #ifdef __sparc__
  183.56  #  include <asm/irq.h>
  183.57  #endif
  183.58 -#include <xeno/init.h>
  183.59 +#include <xen/init.h>
  183.60  
  183.61  #ifndef	__init
  183.62  #define	__init
  183.63 @@ -110,7 +110,7 @@
  183.64  #include "../constants.h"
  183.65  #include "../sd.h"
  183.66  
  183.67 -#include <xeno/types.h>
  183.68 +#include <xen/types.h>
  183.69  
  183.70  /*
  183.71   *  Define BITS_PER_LONG for earlier linux versions.
   184.1 --- a/xen/include/asm-i386/apic.h	Tue Mar 23 09:33:07 2004 +0000
   184.2 +++ b/xen/include/asm-i386/apic.h	Tue Mar 23 09:48:06 2004 +0000
   184.3 @@ -1,7 +1,7 @@
   184.4  #ifndef __ASM_APIC_H
   184.5  #define __ASM_APIC_H
   184.6  
   184.7 -#include <xeno/config.h>
   184.8 +#include <xen/config.h>
   184.9  #include <asm/ptrace.h>
  184.10  #include <asm/apicdef.h>
  184.11  #include <asm/system.h>
   185.1 --- a/xen/include/asm-i386/atomic.h	Tue Mar 23 09:33:07 2004 +0000
   185.2 +++ b/xen/include/asm-i386/atomic.h	Tue Mar 23 09:48:06 2004 +0000
   185.3 @@ -1,7 +1,7 @@
   185.4  #ifndef __ARCH_I386_ATOMIC__
   185.5  #define __ARCH_I386_ATOMIC__
   185.6  
   185.7 -#include <xeno/config.h>
   185.8 +#include <xen/config.h>
   185.9  
  185.10  /*
  185.11   * Atomic operations that C can't guarantee us.  Useful for
   186.1 --- a/xen/include/asm-i386/bitops.h	Tue Mar 23 09:33:07 2004 +0000
   186.2 +++ b/xen/include/asm-i386/bitops.h	Tue Mar 23 09:48:06 2004 +0000
   186.3 @@ -5,7 +5,7 @@
   186.4   * Copyright 1992, Linus Torvalds.
   186.5   */
   186.6  
   186.7 -#include <xeno/config.h>
   186.8 +#include <xen/config.h>
   186.9  
  186.10  /*
  186.11   * These have to be done with inline assembly: that way the bit-setting
   187.1 --- a/xen/include/asm-i386/byteorder.h	Tue Mar 23 09:33:07 2004 +0000
   187.2 +++ b/xen/include/asm-i386/byteorder.h	Tue Mar 23 09:48:06 2004 +0000
   187.3 @@ -7,7 +7,7 @@
   187.4  
   187.5  /* For avoiding bswap on i386 */
   187.6  #ifdef __KERNEL__
   187.7 -#include <xeno/config.h>
   187.8 +#include <xen/config.h>
   187.9  #endif
  187.10  
  187.11  static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
  187.12 @@ -42,6 +42,6 @@ static __inline__ __const__ __u16 ___arc
  187.13  
  187.14  #endif /* __GNUC__ */
  187.15  
  187.16 -#include <xeno/byteorder/little_endian.h>
  187.17 +#include <xen/byteorder/little_endian.h>
  187.18  
  187.19  #endif /* _I386_BYTEORDER_H */
   188.1 --- a/xen/include/asm-i386/cache.h	Tue Mar 23 09:33:07 2004 +0000
   188.2 +++ b/xen/include/asm-i386/cache.h	Tue Mar 23 09:48:06 2004 +0000
   188.3 @@ -4,7 +4,7 @@
   188.4  #ifndef __ARCH_I386_CACHE_H
   188.5  #define __ARCH_I386_CACHE_H
   188.6  
   188.7 -#include <xeno/config.h>
   188.8 +#include <xen/config.h>
   188.9  
  188.10  /* L1 cache line size */
  188.11  #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
   189.1 --- a/xen/include/asm-i386/dma.h	Tue Mar 23 09:33:07 2004 +0000
   189.2 +++ b/xen/include/asm-i386/dma.h	Tue Mar 23 09:48:06 2004 +0000
   189.3 @@ -8,10 +8,10 @@
   189.4  #ifndef _ASM_DMA_H
   189.5  #define _ASM_DMA_H
   189.6  
   189.7 -#include <xeno/config.h>
   189.8 -#include <xeno/spinlock.h>	/* And spinlocks */
   189.9 +#include <xen/config.h>
  189.10 +#include <xen/spinlock.h>	/* And spinlocks */
  189.11  #include <asm/io.h>		/* need byte IO */
  189.12 -#include <xeno/delay.h>
  189.13 +#include <xen/delay.h>
  189.14  
  189.15  
  189.16  #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
   190.1 --- a/xen/include/asm-i386/domain_page.h	Tue Mar 23 09:33:07 2004 +0000
   190.2 +++ b/xen/include/asm-i386/domain_page.h	Tue Mar 23 09:48:06 2004 +0000
   190.3 @@ -7,8 +7,8 @@
   190.4  #ifndef __ASM_DOMAIN_PAGE_H__
   190.5  #define __ASM_DOMAIN_PAGE_H__
   190.6  
   190.7 -#include <xeno/config.h>
   190.8 -#include <xeno/sched.h>
   190.9 +#include <xen/config.h>
  190.10 +#include <xen/sched.h>
  190.11  
  190.12  extern unsigned long *mapcache;
  190.13  #define MAPCACHE_ENTRIES        1024
   191.1 --- a/xen/include/asm-i386/fixmap.h	Tue Mar 23 09:33:07 2004 +0000
   191.2 +++ b/xen/include/asm-i386/fixmap.h	Tue Mar 23 09:48:06 2004 +0000
   191.3 @@ -13,7 +13,7 @@
   191.4  #ifndef _ASM_FIXMAP_H
   191.5  #define _ASM_FIXMAP_H
   191.6  
   191.7 -#include <xeno/config.h>
   191.8 +#include <xen/config.h>
   191.9  #include <asm/apicdef.h>
  191.10  #include <asm/page.h>
  191.11  
   192.1 --- a/xen/include/asm-i386/flushtlb.h	Tue Mar 23 09:33:07 2004 +0000
   192.2 +++ b/xen/include/asm-i386/flushtlb.h	Tue Mar 23 09:48:06 2004 +0000
   192.3 @@ -10,7 +10,7 @@
   192.4  #ifndef __FLUSHTLB_H__
   192.5  #define __FLUSHTLB_H__
   192.6  
   192.7 -#include <xeno/smp.h>
   192.8 +#include <xen/smp.h>
   192.9  
  192.10  /*
  192.11   * Every GLOBAL_FLUSH_PERIOD ticks of the tlbflush clock, every TLB in the
   193.1 --- a/xen/include/asm-i386/hardirq.h	Tue Mar 23 09:33:07 2004 +0000
   193.2 +++ b/xen/include/asm-i386/hardirq.h	Tue Mar 23 09:48:06 2004 +0000
   193.3 @@ -1,8 +1,8 @@
   193.4  #ifndef __ASM_HARDIRQ_H
   193.5  #define __ASM_HARDIRQ_H
   193.6  
   193.7 -#include <xeno/config.h>
   193.8 -#include <xeno/irq.h>
   193.9 +#include <xen/config.h>
  193.10 +#include <xen/irq.h>
  193.11  
  193.12  /* assembly code in softirq.h is sensitive to the offsets of these fields */
  193.13  typedef struct {
  193.14 @@ -14,7 +14,7 @@ typedef struct {
  193.15  	unsigned long idle_timestamp;
  193.16  } ____cacheline_aligned irq_cpustat_t;
  193.17  
  193.18 -#include <xeno/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
  193.19 +#include <xen/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
  193.20  
  193.21  /*
  193.22   * Are we in an interrupt context? Either doing bottom half
   194.1 --- a/xen/include/asm-i386/i387.h	Tue Mar 23 09:33:07 2004 +0000
   194.2 +++ b/xen/include/asm-i386/i387.h	Tue Mar 23 09:48:06 2004 +0000
   194.3 @@ -11,7 +11,7 @@
   194.4  #ifndef __ASM_I386_I387_H
   194.5  #define __ASM_I386_I387_H
   194.6  
   194.7 -#include <xeno/sched.h>
   194.8 +#include <xen/sched.h>
   194.9  #include <asm/processor.h>
  194.10  
  194.11  extern void init_fpu(void);
   195.1 --- a/xen/include/asm-i386/ide.h	Tue Mar 23 09:33:07 2004 +0000
   195.2 +++ b/xen/include/asm-i386/ide.h	Tue Mar 23 09:48:06 2004 +0000
   195.3 @@ -13,7 +13,7 @@
   195.4  
   195.5  #ifdef __KERNEL__
   195.6  
   195.7 -#include <xeno/config.h>
   195.8 +#include <xen/config.h>
   195.9  
  195.10  #ifndef MAX_HWIFS
  195.11  # ifdef CONFIG_BLK_DEV_IDEPCI
   196.1 --- a/xen/include/asm-i386/io.h	Tue Mar 23 09:33:07 2004 +0000
   196.2 +++ b/xen/include/asm-i386/io.h	Tue Mar 23 09:48:06 2004 +0000
   196.3 @@ -1,12 +1,12 @@
   196.4  #ifndef _ASM_IO_H
   196.5  #define _ASM_IO_H
   196.6  
   196.7 -#include <xeno/config.h>
   196.8 +#include <xen/config.h>
   196.9  #include <asm/page.h>
  196.10  
  196.11  #define IO_SPACE_LIMIT 0xffff
  196.12  
  196.13 -/*#include <xeno/vmalloc.h>*/
  196.14 +/*#include <xen/vmalloc.h>*/
  196.15  
  196.16  /*
  196.17   * Temporary debugging check to catch old code using
   197.1 --- a/xen/include/asm-i386/io_apic.h	Tue Mar 23 09:33:07 2004 +0000
   197.2 +++ b/xen/include/asm-i386/io_apic.h	Tue Mar 23 09:48:06 2004 +0000
   197.3 @@ -1,8 +1,8 @@
   197.4  #ifndef __ASM_IO_APIC_H
   197.5  #define __ASM_IO_APIC_H
   197.6  
   197.7 -#include <xeno/config.h>
   197.8 -#include <xeno/types.h>
   197.9 +#include <xen/config.h>
  197.10 +#include <xen/types.h>
  197.11  
  197.12  /*
  197.13   * Intel IO-APIC support for SMP and UP systems.
   198.1 --- a/xen/include/asm-i386/irq.h	Tue Mar 23 09:33:07 2004 +0000
   198.2 +++ b/xen/include/asm-i386/irq.h	Tue Mar 23 09:48:06 2004 +0000
   198.3 @@ -3,7 +3,7 @@
   198.4  
   198.5  /* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar */
   198.6  
   198.7 -#include <xeno/config.h>
   198.8 +#include <xen/config.h>
   198.9  #include <asm/atomic.h>
  198.10  
  198.11  #define SA_INTERRUPT    0x20000000
  198.12 @@ -190,7 +190,7 @@ extern unsigned int * prof_buffer;
  198.13  extern unsigned long prof_len;
  198.14  extern unsigned long prof_shift;
  198.15  
  198.16 -#include <xeno/irq.h>
  198.17 +#include <xen/irq.h>
  198.18  
  198.19  #ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */
  198.20  static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {
   199.1 --- a/xen/include/asm-i386/mc146818rtc.h	Tue Mar 23 09:33:07 2004 +0000
   199.2 +++ b/xen/include/asm-i386/mc146818rtc.h	Tue Mar 23 09:48:06 2004 +0000
   199.3 @@ -5,7 +5,7 @@
   199.4  #define _ASM_MC146818RTC_H
   199.5  
   199.6  #include <asm/io.h>
   199.7 -#include <xeno/spinlock.h>
   199.8 +#include <xen/spinlock.h>
   199.9  
  199.10  extern spinlock_t rtc_lock;             /* serialize CMOS RAM access */
  199.11  
   200.1 --- a/xen/include/asm-i386/page.h	Tue Mar 23 09:33:07 2004 +0000
   200.2 +++ b/xen/include/asm-i386/page.h	Tue Mar 23 09:48:06 2004 +0000
   200.3 @@ -20,7 +20,7 @@
   200.4  #define copy_page(_t,_f)         memcpy((void *)(_t), (void *)(_f), PAGE_SIZE)
   200.5  
   200.6  #ifndef __ASSEMBLY__
   200.7 -#include <xeno/config.h>
   200.8 +#include <xen/config.h>
   200.9  typedef struct { unsigned long l1_lo; } l1_pgentry_t;
  200.10  typedef struct { unsigned long l2_lo; } l2_pgentry_t;
  200.11  typedef l1_pgentry_t *l1_pagetable_t;
   201.1 --- a/xen/include/asm-i386/pci.h	Tue Mar 23 09:33:07 2004 +0000
   201.2 +++ b/xen/include/asm-i386/pci.h	Tue Mar 23 09:48:06 2004 +0000
   201.3 @@ -1,7 +1,7 @@
   201.4  #ifndef __i386_PCI_H
   201.5  #define __i386_PCI_H
   201.6  
   201.7 -#include <xeno/config.h>
   201.8 +#include <xen/config.h>
   201.9  
  201.10  #ifdef __KERNEL__
  201.11  
  201.12 @@ -33,10 +33,10 @@ int pcibios_set_irq_routing(struct pci_d
  201.13   * i386 has everything mapped statically.
  201.14   */
  201.15  
  201.16 -#include <xeno/types.h>
  201.17 -#include <xeno/slab.h>
  201.18 +#include <xen/types.h>
  201.19 +#include <xen/slab.h>
  201.20  #include <asm/scatterlist.h>
  201.21 -/*#include <xeno/string.h>*/
  201.22 +/*#include <xen/string.h>*/
  201.23  #include <asm/io.h>
  201.24  
  201.25  struct pci_dev;
   202.1 --- a/xen/include/asm-i386/pdb.h	Tue Mar 23 09:33:07 2004 +0000
   202.2 +++ b/xen/include/asm-i386/pdb.h	Tue Mar 23 09:48:06 2004 +0000
   202.3 @@ -12,7 +12,7 @@
   202.4  #define __PDB_H__
   202.5  
   202.6  #include <asm/ptrace.h>
   202.7 -#include <xeno/list.h>
   202.8 +#include <xen/list.h>
   202.9  
  202.10  extern int pdb_initialized;
  202.11  extern int pdb_com_port;
   203.1 --- a/xen/include/asm-i386/pgalloc.h	Tue Mar 23 09:33:07 2004 +0000
   203.2 +++ b/xen/include/asm-i386/pgalloc.h	Tue Mar 23 09:48:06 2004 +0000
   203.3 @@ -1,8 +1,8 @@
   203.4  #ifndef _I386_PGALLOC_H
   203.5  #define _I386_PGALLOC_H
   203.6  
   203.7 -#include <xeno/config.h>
   203.8 -#include <xeno/sched.h>
   203.9 +#include <xen/config.h>
  203.10 +#include <xen/sched.h>
  203.11  #include <asm/processor.h>
  203.12  #include <asm/fixmap.h>
  203.13  
  203.14 @@ -57,7 +57,7 @@
  203.15  
  203.16  #else
  203.17  
  203.18 -#include <xeno/smp.h>
  203.19 +#include <xen/smp.h>
  203.20  
  203.21  extern int try_flush_tlb_mask(unsigned long mask);
  203.22  extern void flush_tlb_mask(unsigned long mask);
   204.1 --- a/xen/include/asm-i386/processor.h	Tue Mar 23 09:33:07 2004 +0000
   204.2 +++ b/xen/include/asm-i386/processor.h	Tue Mar 23 09:48:06 2004 +0000
   204.3 @@ -11,7 +11,7 @@
   204.4  #include <asm/types.h>
   204.5  #include <asm/cpufeature.h>
   204.6  #include <asm/desc.h>
   204.7 -#include <xeno/config.h>
   204.8 +#include <xen/config.h>
   204.9  #include <hypervisor-ifs/hypervisor-if.h>
  204.10  
  204.11  struct task_struct;
   205.1 --- a/xen/include/asm-i386/smp.h	Tue Mar 23 09:33:07 2004 +0000
   205.2 +++ b/xen/include/asm-i386/smp.h	Tue Mar 23 09:48:06 2004 +0000
   205.3 @@ -1,7 +1,7 @@
   205.4  #ifndef __ASM_SMP_H
   205.5  #define __ASM_SMP_H
   205.6  
   205.7 -#include <xeno/config.h>
   205.8 +#include <xen/config.h>
   205.9  #include <asm/ptrace.h>
  205.10  
  205.11  #ifdef CONFIG_SMP
   206.1 --- a/xen/include/asm-i386/spinlock.h	Tue Mar 23 09:33:07 2004 +0000
   206.2 +++ b/xen/include/asm-i386/spinlock.h	Tue Mar 23 09:48:06 2004 +0000
   206.3 @@ -1,8 +1,8 @@
   206.4  #ifndef __ASM_SPINLOCK_H
   206.5  #define __ASM_SPINLOCK_H
   206.6  
   206.7 -#include <xeno/config.h>
   206.8 -#include <xeno/lib.h>
   206.9 +#include <xen/config.h>
  206.10 +#include <xen/lib.h>
  206.11  #include <asm/atomic.h>
  206.12  #include <asm/rwlock.h>
  206.13  
   207.1 --- a/xen/include/asm-i386/string.h	Tue Mar 23 09:33:07 2004 +0000
   207.2 +++ b/xen/include/asm-i386/string.h	Tue Mar 23 09:48:06 2004 +0000
   207.3 @@ -2,7 +2,7 @@
   207.4  #define _I386_STRING_H_
   207.5  
   207.6  #ifdef __KERNEL__
   207.7 -#include <xeno/config.h>
   207.8 +#include <xen/config.h>
   207.9  /*
  207.10   * On a 486 or Pentium, we are better off not using the
  207.11   * byte string operations. But on a 386 or a PPro the
   208.1 --- a/xen/include/asm-i386/system.h	Tue Mar 23 09:33:07 2004 +0000
   208.2 +++ b/xen/include/asm-i386/system.h	Tue Mar 23 09:48:06 2004 +0000
   208.3 @@ -1,7 +1,7 @@
   208.4  #ifndef __ASM_SYSTEM_H
   208.5  #define __ASM_SYSTEM_H
   208.6  
   208.7 -#include <xeno/config.h>
   208.8 +#include <xen/config.h>
   208.9  #include <asm/bitops.h>
  208.10  
  208.11  /* Clear and set 'TS' bit respectively */
   209.1 --- a/xen/include/asm-i386/timex.h	Tue Mar 23 09:33:07 2004 +0000
   209.2 +++ b/xen/include/asm-i386/timex.h	Tue Mar 23 09:48:06 2004 +0000
   209.3 @@ -6,7 +6,7 @@
   209.4  #ifndef _ASMi386_TIMEX_H
   209.5  #define _ASMi386_TIMEX_H
   209.6  
   209.7 -#include <xeno/config.h>
   209.8 +#include <xen/config.h>
   209.9  #include <asm/msr.h>
  209.10  
  209.11  #ifdef CONFIG_MELAN
   210.1 --- a/xen/include/asm-i386/types.h	Tue Mar 23 09:33:07 2004 +0000
   210.2 +++ b/xen/include/asm-i386/types.h	Tue Mar 23 09:48:06 2004 +0000
   210.3 @@ -24,7 +24,7 @@ typedef __signed__ long long __s64;
   210.4  typedef unsigned long long __u64;
   210.5  #endif
   210.6  
   210.7 -#include <xeno/config.h>
   210.8 +#include <xen/config.h>
   210.9  
  210.10  typedef signed char s8;
  210.11  typedef unsigned char u8;
   211.1 --- a/xen/include/asm-i386/uaccess.h	Tue Mar 23 09:33:07 2004 +0000
   211.2 +++ b/xen/include/asm-i386/uaccess.h	Tue Mar 23 09:48:06 2004 +0000
   211.3 @@ -4,10 +4,10 @@
   211.4  /*
   211.5   * User space memory access functions
   211.6   */
   211.7 -#include <xeno/config.h>
   211.8 -#include <xeno/errno.h>
   211.9 -#include <xeno/sched.h>
  211.10 -#include <xeno/prefetch.h>
  211.11 +#include <xen/config.h>
  211.12 +#include <xen/errno.h>
  211.13 +#include <xen/sched.h>
  211.14 +#include <xen/prefetch.h>
  211.15  #include <asm/page.h>
  211.16  
  211.17  #define VERIFY_READ 0
   212.1 --- a/xen/include/asm-x86_64/apic.h	Tue Mar 23 09:33:07 2004 +0000
   212.2 +++ b/xen/include/asm-x86_64/apic.h	Tue Mar 23 09:48:06 2004 +0000
   212.3 @@ -1,7 +1,7 @@
   212.4  #ifndef __ASM_APIC_H
   212.5  #define __ASM_APIC_H
   212.6  
   212.7 -#include <xeno/config.h>
   212.8 +#include <xen/config.h>
   212.9  #include <asm/ptrace.h>
  212.10  #include <asm/apicdef.h>
  212.11  #include <asm/system.h>
   213.1 --- a/xen/include/asm-x86_64/atomic.h	Tue Mar 23 09:33:07 2004 +0000
   213.2 +++ b/xen/include/asm-x86_64/atomic.h	Tue Mar 23 09:48:06 2004 +0000
   213.3 @@ -1,7 +1,7 @@
   213.4  #ifndef __ARCH_X86_64_ATOMIC__
   213.5  #define __ARCH_X86_64_ATOMIC__
   213.6  
   213.7 -#include <xeno/config.h>
   213.8 +#include <xen/config.h>
   213.9  
  213.10  /*
  213.11   * Atomic operations that C can't guarantee us.  Useful for
   214.1 --- a/xen/include/asm-x86_64/bitops.h	Tue Mar 23 09:33:07 2004 +0000
   214.2 +++ b/xen/include/asm-x86_64/bitops.h	Tue Mar 23 09:48:06 2004 +0000
   214.3 @@ -5,7 +5,7 @@
   214.4   * Copyright 1992, Linus Torvalds.
   214.5   */
   214.6  
   214.7 -#include <xeno/config.h>
   214.8 +#include <xen/config.h>
   214.9  
  214.10  /*
  214.11   * These have to be done with inline assembly: that way the bit-setting
   215.1 --- a/xen/include/asm-x86_64/byteorder.h	Tue Mar 23 09:33:07 2004 +0000
   215.2 +++ b/xen/include/asm-x86_64/byteorder.h	Tue Mar 23 09:48:06 2004 +0000
   215.3 @@ -27,6 +27,6 @@ static __inline__ __const__ __u32 ___arc
   215.4  
   215.5  #define __BYTEORDER_HAS_U64__
   215.6  
   215.7 -#include <xeno/byteorder/little_endian.h>
   215.8 +#include <xen/byteorder/little_endian.h>
   215.9  
  215.10  #endif /* _X86_64_BYTEORDER_H */
   216.1 --- a/xen/include/asm-x86_64/cache.h	Tue Mar 23 09:33:07 2004 +0000
   216.2 +++ b/xen/include/asm-x86_64/cache.h	Tue Mar 23 09:48:06 2004 +0000
   216.3 @@ -4,7 +4,7 @@
   216.4  #ifndef __ARCH_X8664_CACHE_H
   216.5  #define __ARCH_X8664_CACHE_H
   216.6  
   216.7 -#include <xeno/config.h>
   216.8 +#include <xen/config.h>
   216.9  
  216.10  /* L1 cache line size */
  216.11  #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
   217.1 --- a/xen/include/asm-x86_64/dma.h	Tue Mar 23 09:33:07 2004 +0000
   217.2 +++ b/xen/include/asm-x86_64/dma.h	Tue Mar 23 09:48:06 2004 +0000
   217.3 @@ -8,10 +8,10 @@
   217.4  #ifndef _ASM_DMA_H
   217.5  #define _ASM_DMA_H
   217.6  
   217.7 -#include <xeno/config.h>
   217.8 -#include <xeno/spinlock.h>	/* And spinlocks */
   217.9 +#include <xen/config.h>
  217.10 +#include <xen/spinlock.h>	/* And spinlocks */
  217.11  #include <asm/io.h>		/* need byte IO */
  217.12 -#include <xeno/delay.h>
  217.13 +#include <xen/delay.h>
  217.14  
  217.15  
  217.16  #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
   218.1 --- a/xen/include/asm-x86_64/domain_page.h	Tue Mar 23 09:33:07 2004 +0000
   218.2 +++ b/xen/include/asm-x86_64/domain_page.h	Tue Mar 23 09:48:06 2004 +0000
   218.3 @@ -7,8 +7,8 @@
   218.4  #ifndef __ASM_DOMAIN_PAGE_H__
   218.5  #define __ASM_DOMAIN_PAGE_H__
   218.6  
   218.7 -#include <xeno/config.h>
   218.8 -#include <xeno/sched.h>
   218.9 +#include <xen/config.h>
  218.10 +#include <xen/sched.h>
  218.11  #include <asm/page.h>
  218.12  
  218.13  /*
   219.1 --- a/xen/include/asm-x86_64/fixmap.h	Tue Mar 23 09:33:07 2004 +0000
   219.2 +++ b/xen/include/asm-x86_64/fixmap.h	Tue Mar 23 09:48:06 2004 +0000
   219.3 @@ -13,7 +13,7 @@
   219.4  #ifndef _ASM_FIXMAP_H
   219.5  #define _ASM_FIXMAP_H
   219.6  
   219.7 -#include <xeno/config.h>
   219.8 +#include <xen/config.h>
   219.9  #include <asm/apicdef.h>
  219.10  #include <asm/page.h>
  219.11  
   220.1 --- a/xen/include/asm-x86_64/flushtlb.h	Tue Mar 23 09:33:07 2004 +0000
   220.2 +++ b/xen/include/asm-x86_64/flushtlb.h	Tue Mar 23 09:48:06 2004 +0000
   220.3 @@ -10,7 +10,7 @@
   220.4  #ifndef __FLUSHTLB_H__
   220.5  #define __FLUSHTLB_H__
   220.6  
   220.7 -#include <xeno/smp.h>
   220.8 +#include <xen/smp.h>
   220.9  
  220.10  /*
  220.11   * Every GLOBAL_FLUSH_PERIOD ticks of the tlbflush clock, every TLB in the
   221.1 --- a/xen/include/asm-x86_64/hardirq.h	Tue Mar 23 09:33:07 2004 +0000
   221.2 +++ b/xen/include/asm-x86_64/hardirq.h	Tue Mar 23 09:48:06 2004 +0000
   221.3 @@ -1,8 +1,8 @@
   221.4  #ifndef __ASM_HARDIRQ_H
   221.5  #define __ASM_HARDIRQ_H
   221.6  
   221.7 -#include <xeno/config.h>
   221.8 -#include <xeno/irq.h>
   221.9 +#include <xen/config.h>
  221.10 +#include <xen/irq.h>
  221.11  
  221.12  /* assembly code in softirq.h is sensitive to the offsets of these fields */
  221.13  typedef struct {
  221.14 @@ -14,7 +14,7 @@ typedef struct {
  221.15  	unsigned long idle_timestamp;
  221.16  } ____cacheline_aligned irq_cpustat_t;
  221.17  
  221.18 -#include <xeno/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
  221.19 +#include <xen/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
  221.20  
  221.21  /*
  221.22   * Are we in an interrupt context? Either doing bottom half
   222.1 --- a/xen/include/asm-x86_64/i387.h	Tue Mar 23 09:33:07 2004 +0000
   222.2 +++ b/xen/include/asm-x86_64/i387.h	Tue Mar 23 09:48:06 2004 +0000
   222.3 @@ -11,7 +11,7 @@
   222.4  #ifndef __ASM_I386_I387_H
   222.5  #define __ASM_I386_I387_H
   222.6  
   222.7 -#include <xeno/sched.h>
   222.8 +#include <xen/sched.h>
   222.9  #include <asm/processor.h>
  222.10  
  222.11  extern void init_fpu(void);
   223.1 --- a/xen/include/asm-x86_64/ide.h	Tue Mar 23 09:33:07 2004 +0000
   223.2 +++ b/xen/include/asm-x86_64/ide.h	Tue Mar 23 09:48:06 2004 +0000
   223.3 @@ -13,7 +13,7 @@
   223.4  
   223.5  #ifdef __KERNEL__
   223.6  
   223.7 -#include <xeno/config.h>
   223.8 +#include <xen/config.h>
   223.9  
  223.10  #ifndef MAX_HWIFS
  223.11  # ifdef CONFIG_BLK_DEV_IDEPCI
   224.1 --- a/xen/include/asm-x86_64/io.h	Tue Mar 23 09:33:07 2004 +0000
   224.2 +++ b/xen/include/asm-x86_64/io.h	Tue Mar 23 09:48:06 2004 +0000
   224.3 @@ -1,7 +1,7 @@
   224.4  #ifndef _ASM_IO_H
   224.5  #define _ASM_IO_H
   224.6  
   224.7 -#include <xeno/config.h>
   224.8 +#include <xen/config.h>
   224.9  #include <asm/page.h>
  224.10  
  224.11  /*
   225.1 --- a/xen/include/asm-x86_64/io_apic.h	Tue Mar 23 09:33:07 2004 +0000
   225.2 +++ b/xen/include/asm-x86_64/io_apic.h	Tue Mar 23 09:48:06 2004 +0000
   225.3 @@ -1,8 +1,8 @@
   225.4  #ifndef __ASM_IO_APIC_H
   225.5  #define __ASM_IO_APIC_H
   225.6  
   225.7 -#include <xeno/config.h>
   225.8 -#include <xeno/types.h>
   225.9 +#include <xen/config.h>
  225.10 +#include <xen/types.h>
  225.11  
  225.12  /*
  225.13   * Intel IO-APIC support for SMP and UP systems.
   226.1 --- a/xen/include/asm-x86_64/irq.h	Tue Mar 23 09:33:07 2004 +0000
   226.2 +++ b/xen/include/asm-x86_64/irq.h	Tue Mar 23 09:48:06 2004 +0000
   226.3 @@ -3,7 +3,7 @@
   226.4  
   226.5  /* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar */
   226.6  
   226.7 -#include <xeno/config.h>
   226.8 +#include <xen/config.h>
   226.9  #include <asm/atomic.h>
  226.10  
  226.11  #define SA_INTERRUPT    0x20000000
  226.12 @@ -122,7 +122,7 @@ extern unsigned int * prof_buffer;
  226.13  extern unsigned long prof_len;
  226.14  extern unsigned long prof_shift;
  226.15  
  226.16 -#include <xeno/irq.h>
  226.17 +#include <xen/irq.h>
  226.18  
  226.19  #ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */
  226.20  static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {
   227.1 --- a/xen/include/asm-x86_64/mc146818rtc.h	Tue Mar 23 09:33:07 2004 +0000
   227.2 +++ b/xen/include/asm-x86_64/mc146818rtc.h	Tue Mar 23 09:48:06 2004 +0000
   227.3 @@ -5,7 +5,7 @@
   227.4  #define _ASM_MC146818RTC_H
   227.5  
   227.6  #include <asm/io.h>
   227.7 -#include <xeno/spinlock.h>
   227.8 +#include <xen/spinlock.h>
   227.9  
  227.10  extern spinlock_t rtc_lock;             /* serialize CMOS RAM access */
  227.11  
   228.1 --- a/xen/include/asm-x86_64/page.h	Tue Mar 23 09:33:07 2004 +0000
   228.2 +++ b/xen/include/asm-x86_64/page.h	Tue Mar 23 09:48:06 2004 +0000
   228.3 @@ -47,7 +47,7 @@
   228.4  #define copy_page(_t,_f)         memcpy((void *)(_t), (void *)(_f), PAGE_SIZE)
   228.5  
   228.6  #ifndef __ASSEMBLY__
   228.7 -#include <xeno/config.h>
   228.8 +#include <xen/config.h>
   228.9  typedef struct { unsigned long l1_lo; } l1_pgentry_t;
  228.10  typedef struct { unsigned long l2_lo; } l2_pgentry_t;
  228.11  typedef struct { unsigned long l3_lo; } l3_pgentry_t;
  228.12 @@ -191,7 +191,7 @@ extern void paging_init(void);
  228.13  #define __flush_tlb_one(__addr) \
  228.14  __asm__ __volatile__("invlpg %0": :"m" (*(char *) (__addr)))
  228.15  
  228.16 -#include <xeno/config.h>
  228.17 +#include <xen/config.h>
  228.18  
  228.19  /*
  228.20   * Tell the user there is some problem.  The exception handler decodes this frame.
   229.1 --- a/xen/include/asm-x86_64/pci.h	Tue Mar 23 09:33:07 2004 +0000
   229.2 +++ b/xen/include/asm-x86_64/pci.h	Tue Mar 23 09:48:06 2004 +0000
   229.3 @@ -1,7 +1,7 @@
   229.4  #ifndef __x8664_PCI_H
   229.5  #define __x8664_PCI_H
   229.6  
   229.7 -#include <xeno/config.h>
   229.8 +#include <xen/config.h>
   229.9  #include <asm/io.h>
  229.10  
  229.11  
  229.12 @@ -24,8 +24,8 @@ void pcibios_penalize_isa_irq(int irq);
  229.13  struct irq_routing_table *pcibios_get_irq_routing_table(void);
  229.14  int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
  229.15  
  229.16 -#include <xeno/types.h>
  229.17 -#include <xeno/slab.h>
  229.18 +#include <xen/types.h>
  229.19 +#include <xen/slab.h>
  229.20  #include <asm/scatterlist.h>
  229.21  #include <asm/io.h>
  229.22  #include <asm/page.h>
   230.1 --- a/xen/include/asm-x86_64/pda.h	Tue Mar 23 09:33:07 2004 +0000
   230.2 +++ b/xen/include/asm-x86_64/pda.h	Tue Mar 23 09:48:06 2004 +0000
   230.3 @@ -1,7 +1,7 @@
   230.4  #ifndef X86_64_PDA_H
   230.5  #define X86_64_PDA_H
   230.6  
   230.7 -#include <xeno/cache.h>
   230.8 +#include <xen/cache.h>
   230.9  
  230.10  /* Per processor datastructure. %gs points to it while the kernel runs */ 
  230.11  /* To use a new field with the *_pda macros it needs to be added to tools/offset.c */
   231.1 --- a/xen/include/asm-x86_64/pdb.h	Tue Mar 23 09:33:07 2004 +0000
   231.2 +++ b/xen/include/asm-x86_64/pdb.h	Tue Mar 23 09:48:06 2004 +0000
   231.3 @@ -12,7 +12,7 @@
   231.4  #define __PDB_H__
   231.5  
   231.6  #include <asm/ptrace.h>
   231.7 -#include <xeno/list.h>
   231.8 +#include <xen/list.h>
   231.9  
  231.10  extern int pdb_initialized;
  231.11  extern int pdb_com_port;
   232.1 --- a/xen/include/asm-x86_64/pgalloc.h	Tue Mar 23 09:33:07 2004 +0000
   232.2 +++ b/xen/include/asm-x86_64/pgalloc.h	Tue Mar 23 09:48:06 2004 +0000
   232.3 @@ -1,8 +1,8 @@
   232.4  #ifndef _X86_64_PGALLOC_H
   232.5  #define _X86_64_PGALLOC_H
   232.6  
   232.7 -#include <xeno/config.h>
   232.8 -#include <xeno/sched.h>
   232.9 +#include <xen/config.h>
  232.10 +#include <xen/sched.h>
  232.11  #include <asm/processor.h>
  232.12  #include <asm/fixmap.h>
  232.13  
  232.14 @@ -27,7 +27,7 @@
  232.15  #define try_flush_tlb_mask(_mask) __flush_tlb()
  232.16  
  232.17  #else
  232.18 -#include <xeno/smp.h>
  232.19 +#include <xen/smp.h>
  232.20  
  232.21  extern int try_flush_tlb_mask(unsigned long mask);
  232.22  extern void flush_tlb_mask(unsigned long mask);
   233.1 --- a/xen/include/asm-x86_64/processor.h	Tue Mar 23 09:33:07 2004 +0000
   233.2 +++ b/xen/include/asm-x86_64/processor.h	Tue Mar 23 09:48:06 2004 +0000
   233.3 @@ -11,7 +11,7 @@
   233.4  #include <asm/types.h>
   233.5  #include <asm/cpufeature.h>
   233.6  #include <asm/desc.h>
   233.7 -#include <xeno/config.h>
   233.8 +#include <xen/config.h>
   233.9  #include <hypervisor-ifs/hypervisor-if.h>
  233.10  
  233.11  struct task_struct;
   234.1 --- a/xen/include/asm-x86_64/smp.h	Tue Mar 23 09:33:07 2004 +0000
   234.2 +++ b/xen/include/asm-x86_64/smp.h	Tue Mar 23 09:48:06 2004 +0000
   234.3 @@ -1,7 +1,7 @@
   234.4  #ifndef __ASM_SMP_H
   234.5  #define __ASM_SMP_H
   234.6  
   234.7 -#include <xeno/config.h>
   234.8 +#include <xen/config.h>
   234.9  #include <asm/ptrace.h>
  234.10  
  234.11  #ifdef CONFIG_SMP
   235.1 --- a/xen/include/asm-x86_64/spinlock.h	Tue Mar 23 09:33:07 2004 +0000
   235.2 +++ b/xen/include/asm-x86_64/spinlock.h	Tue Mar 23 09:48:06 2004 +0000
   235.3 @@ -1,8 +1,8 @@
   235.4  #ifndef __ASM_SPINLOCK_H
   235.5  #define __ASM_SPINLOCK_H
   235.6  
   235.7 -#include <xeno/config.h>
   235.8 -#include <xeno/lib.h>
   235.9 +#include <xen/config.h>
  235.10 +#include <xen/lib.h>
  235.11  #include <asm/atomic.h>
  235.12  #include <asm/rwlock.h>
  235.13  
   236.1 --- a/xen/include/asm-x86_64/system.h	Tue Mar 23 09:33:07 2004 +0000
   236.2 +++ b/xen/include/asm-x86_64/system.h	Tue Mar 23 09:48:06 2004 +0000
   236.3 @@ -1,7 +1,7 @@
   236.4  #ifndef __ASM_SYSTEM_H
   236.5  #define __ASM_SYSTEM_H
   236.6  
   236.7 -#include <xeno/config.h>
   236.8 +#include <xen/config.h>
   236.9  #include <asm/bitops.h>
  236.10  
  236.11  /* Clear and set 'TS' bit respectively */
   237.1 --- a/xen/include/asm-x86_64/timex.h	Tue Mar 23 09:33:07 2004 +0000
   237.2 +++ b/xen/include/asm-x86_64/timex.h	Tue Mar 23 09:48:06 2004 +0000
   237.3 @@ -6,7 +6,7 @@
   237.4  #ifndef _ASMx8664_TIMEX_H
   237.5  #define _ASMx8664_TIMEX_H
   237.6  
   237.7 -#include <xeno/config.h>
   237.8 +#include <xen/config.h>
   237.9  #include <asm/msr.h>
  237.10  
  237.11  #define CLOCK_TICK_RATE (vxtime_hz)
   238.1 --- a/xen/include/asm-x86_64/types.h	Tue Mar 23 09:33:07 2004 +0000
   238.2 +++ b/xen/include/asm-x86_64/types.h	Tue Mar 23 09:48:06 2004 +0000
   238.3 @@ -22,7 +22,7 @@ typedef unsigned int __u32;
   238.4  typedef __signed__ long long __s64;
   238.5  typedef unsigned long long __u64;
   238.6  
   238.7 -#include <xeno/config.h>
   238.8 +#include <xen/config.h>
   238.9  
  238.10  typedef signed char s8;
  238.11  typedef unsigned char u8;
   239.1 --- a/xen/include/asm-x86_64/uaccess.h	Tue Mar 23 09:33:07 2004 +0000
   239.2 +++ b/xen/include/asm-x86_64/uaccess.h	Tue Mar 23 09:48:06 2004 +0000
   239.3 @@ -4,10 +4,10 @@
   239.4  /*
   239.5   * User space memory access functions
   239.6   */
   239.7 -#include <xeno/config.h>
   239.8 -#include <xeno/sched.h>
   239.9 -#include <xeno/prefetch.h>
  239.10 -#include <xeno/errno.h>
  239.11 +#include <xen/config.h>
  239.12 +#include <xen/sched.h>
  239.13 +#include <xen/prefetch.h>
  239.14 +#include <xen/errno.h>
  239.15  #include <asm/page.h>
  239.16  
  239.17  #define VERIFY_READ 0
   240.1 --- a/xen/include/hypervisor-ifs/hypervisor-if.h	Tue Mar 23 09:33:07 2004 +0000
   240.2 +++ b/xen/include/hypervisor-ifs/hypervisor-if.h	Tue Mar 23 09:48:06 2004 +0000
   240.3 @@ -223,7 +223,7 @@ typedef struct shared_info_st {
   240.4       * atomically!). The guest OS detects this because 'time_version1' is
   240.5       * incremented just before updating these values, and 'time_version2' is
   240.6       * incremented immediately after. See Xenolinux code for an example of how 
   240.7 -     * to read these values safely (arch/xeno/kernel/time.c).
   240.8 +     * to read these values safely (arch/xen/kernel/time.c).
   240.9       */
  240.10      unsigned long      time_version1;   /* A version number for info below.  */
  240.11      unsigned long      time_version2;   /* A version number for info below.  */
   241.1 --- a/xen/include/scsi/scsicam.h	Tue Mar 23 09:33:07 2004 +0000
   241.2 +++ b/xen/include/scsi/scsicam.h	Tue Mar 23 09:48:06 2004 +0000
   241.3 @@ -12,6 +12,6 @@
   241.4  
   241.5  #ifndef SCSICAM_H
   241.6  #define SCSICAM_H
   241.7 -#include <xeno/kdev_t.h>
   241.8 +#include <xen/kdev_t.h>
   241.9  extern int scsicam_bios_param (Disk *disk, kdev_t dev, int *ip);
  241.10  #endif /* def SCSICAM_H */
   242.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   242.2 +++ b/xen/include/xen/ac_timer.h	Tue Mar 23 09:48:06 2004 +0000
   242.3 @@ -0,0 +1,91 @@
   242.4 +/* -*-  Mode:C; c-basic-offset:4; tab-width:4 -*-
   242.5 + ****************************************************************************
   242.6 + * (C) 2002 - Rolf Neugebauer - Intel Research Cambridge
   242.7 + ****************************************************************************
   242.8 + *
   242.9 + *        File: ac_timer.h
  242.10 + *      Author: Rolf Neugebauer (neugebar@dcs.gla.ac.uk)
  242.11 + *     Changes: 
  242.12 + *              
  242.13 + *        Date: Nov 2002
  242.14 + * 
  242.15 + * Environment: Xen Hypervisor
  242.16 + * Description: Accurate timer for the Hypervisor
  242.17 + * 
  242.18 + ****************************************************************************
  242.19 + * $Id: h-insert.h,v 1.4 2002/11/08 16:03:55 rn Exp $
  242.20 + ****************************************************************************
  242.21 + */
  242.22 +
  242.23 +#ifndef _AC_TIMER_H_
  242.24 +#define _AC_TIMER_H_
  242.25 +
  242.26 +#include <xen/time.h>
  242.27 +
  242.28 +struct ac_timer {
  242.29 +    /*
  242.30 +     * PUBLIC FIELDS
  242.31 +     */
  242.32 +    /* System time expiry value (nanoseconds since boot). */
  242.33 +    s_time_t         expires;
  242.34 +    /* CPU on which this timer will be installed and executed. */
  242.35 +    unsigned int     cpu;
  242.36 +    /* On expiry, '(*function)(data)' will be executed in softirq context. */
  242.37 +    unsigned long    data;
  242.38 +    void             (*function)(unsigned long);
  242.39 +
  242.40 +    /*
  242.41 +     * PRIVATE FIELDS
  242.42 +     */
  242.43 +    unsigned int     heap_offset;
  242.44 +};
  242.45 +
  242.46 +/*
  242.47 + * This function can be called for any CPU from any CPU in any context.
  242.48 + * It initialises the private fields of the ac_timer structure.
  242.49 + */
  242.50 +static __inline__ void init_ac_timer(struct ac_timer *timer)
  242.51 +{
  242.52 +    timer->heap_offset = 0;
  242.53 +}
  242.54 +
  242.55 +/*
  242.56 + * This function can be called for any CPU from any CPU in any context.
  242.57 + * It returns TRUE if the given timer is on a timer list.
  242.58 + */
  242.59 +static __inline__ int active_ac_timer(struct ac_timer *timer)
  242.60 +{
  242.61 +    return (timer->heap_offset != 0);
  242.62 +}
  242.63 +
  242.64 +/*
  242.65 + * This function can be called for any CPU from any CPU in any context, BUT:
  242.66 + *  -- The private fields must have been initialised (ac_timer_init).
  242.67 + *  -- All public fields must be initialised.
  242.68 + *  -- The timer must not currently be on a timer list.
  242.69 + */
  242.70 +extern void add_ac_timer(struct ac_timer *timer);
  242.71 +
  242.72 +/*
  242.73 + * This function can be called for any CPU from any CPU in any context, BUT:
  242.74 + *  -- The private fields must have been initialised (ac_timer_init).
  242.75 + *  -- All public fields must be initialised.
  242.76 + *  -- The timer must currently be on a timer list.
  242.77 + */
  242.78 +extern void rem_ac_timer(struct ac_timer *timer);
  242.79 +
  242.80 +/*
  242.81 + * This function can be called for any CPU from any CPU in any context, BUT:
  242.82 + *  -- The private fields must have been initialised (ac_timer_init).
  242.83 + *  -- All public fields must be initialised.
  242.84 + */
  242.85 +extern void mod_ac_timer(struct ac_timer *timer, s_time_t new_time);
  242.86 +
  242.87 +
  242.88 +/*
  242.89 + * PRIVATE DEFINITIONS
  242.90 + */
  242.91 +
  242.92 +extern int reprogram_ac_timer(s_time_t timeout);
  242.93 +
  242.94 +#endif /* _AC_TIMER_H_ */
   243.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   243.2 +++ b/xen/include/xen/blk.h	Tue Mar 23 09:48:06 2004 +0000
   243.3 @@ -0,0 +1,409 @@
   243.4 +#ifndef _BLK_H
   243.5 +#define _BLK_H
   243.6 +
   243.7 +#include <xen/blkdev.h>
   243.8 +/*#include <xen/locks.h>*/
   243.9 +#include <xen/config.h>
  243.10 +#include <xen/spinlock.h>
  243.11 +
  243.12 +/*
  243.13 + * Spinlock for protecting the request queue which
  243.14 + * is mucked around with in interrupts on potentially
  243.15 + * multiple CPU's..
  243.16 + */
  243.17 +extern spinlock_t io_request_lock;
  243.18 +
  243.19 +/*
  243.20 + * Initialization functions.
  243.21 + */
  243.22 +extern int isp16_init(void);
  243.23 +extern int cdu31a_init(void);
  243.24 +extern int acsi_init(void);
  243.25 +extern int mcd_init(void);
  243.26 +extern int mcdx_init(void);
  243.27 +extern int sbpcd_init(void);
  243.28 +extern int aztcd_init(void);
  243.29 +extern int sony535_init(void);
  243.30 +extern int gscd_init(void);
  243.31 +extern int cm206_init(void);
  243.32 +extern int optcd_init(void);
  243.33 +extern int sjcd_init(void);
  243.34 +extern int cdi_init(void);
  243.35 +extern int hd_init(void);
  243.36 +extern int ide_init(void);
  243.37 +extern int xd_init(void);
  243.38 +extern int mfm_init(void);
  243.39 +extern int loop_init(void);
  243.40 +extern int md_init(void);
  243.41 +extern int ap_init(void);
  243.42 +extern int ddv_init(void);
  243.43 +extern int z2_init(void);
  243.44 +extern int swim3_init(void);
  243.45 +extern int swimiop_init(void);
  243.46 +extern int amiga_floppy_init(void);
  243.47 +extern int atari_floppy_init(void);
  243.48 +extern int ez_init(void);
  243.49 +extern int bpcd_init(void);
  243.50 +extern int ps2esdi_init(void);
  243.51 +extern int jsfd_init(void);
  243.52 +extern int viodasd_init(void);
  243.53 +extern int viocd_init(void);
  243.54 +
  243.55 +#if defined(CONFIG_ARCH_S390)
  243.56 +extern int dasd_init(void);
  243.57 +extern int xpram_init(void);
  243.58 +extern int tapeblock_init(void);
  243.59 +#endif /* CONFIG_ARCH_S390 */
  243.60 +
  243.61 +extern void set_device_ro(kdev_t dev,int flag);
  243.62 +#if 0
  243.63 +void add_blkdev_randomness(int major);
  243.64 +#else
  243.65 +#define add_blkdev_randomness(_major) ((void)0)
  243.66 +#endif
  243.67 +
  243.68 +extern int floppy_init(void);
  243.69 +extern int rd_doload;		/* 1 = load ramdisk, 0 = don't load */
  243.70 +extern int rd_prompt;		/* 1 = prompt for ramdisk, 0 = don't prompt */
  243.71 +extern int rd_image_start;	/* starting block # of image */
  243.72 +
  243.73 +#ifdef CONFIG_BLK_DEV_INITRD
  243.74 +
  243.75 +#define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */
  243.76 +
  243.77 +extern unsigned long initrd_start,initrd_end;
  243.78 +extern int initrd_below_start_ok; /* 1 if it is not an error if initrd_start < memory_start */
  243.79 +void initrd_init(void);
  243.80 +
  243.81 +#endif
  243.82 +
  243.83 +		 
  243.84 +/*
  243.85 + * end_request() and friends. Must be called with the request queue spinlock
  243.86 + * acquired. All functions called within end_request() _must_be_ atomic.
  243.87 + *
  243.88 + * Several drivers define their own end_request and call
  243.89 + * end_that_request_first() and end_that_request_last()
  243.90 + * for parts of the original function. This prevents
  243.91 + * code duplication in drivers.
  243.92 + */
  243.93 +
  243.94 +static inline void blkdev_dequeue_request(struct request * req)
  243.95 +{
  243.96 +	list_del(&req->queue);
  243.97 +}
  243.98 +
  243.99 +int end_that_request_first(struct request *req, int uptodate, char *name);
 243.100 +void end_that_request_last(struct request *req);
 243.101 +
 243.102 +#if defined(MAJOR_NR) || defined(IDE_DRIVER)
 243.103 +
 243.104 +#undef DEVICE_ON
 243.105 +#undef DEVICE_OFF
 243.106 +
 243.107 +/*
 243.108 + * Add entries as needed.
 243.109 + */
 243.110 +
 243.111 +#ifdef IDE_DRIVER
 243.112 +
 243.113 +#define DEVICE_NR(device)	(MINOR(device) >> PARTN_BITS)
 243.114 +#define DEVICE_NAME "ide"
 243.115 +
 243.116 +#elif (MAJOR_NR == RAMDISK_MAJOR)
 243.117 +
 243.118 +/* ram disk */
 243.119 +#define DEVICE_NAME "ramdisk"
 243.120 +#define DEVICE_NR(device) (MINOR(device))
 243.121 +#define DEVICE_NO_RANDOM
 243.122 +
 243.123 +#elif (MAJOR_NR == Z2RAM_MAJOR)
 243.124 +
 243.125 +/* Zorro II Ram */
 243.126 +#define DEVICE_NAME "Z2RAM"
 243.127 +#define DEVICE_REQUEST do_z2_request
 243.128 +#define DEVICE_NR(device) (MINOR(device))
 243.129 +
 243.130 +#elif (MAJOR_NR == FLOPPY_MAJOR)
 243.131 +
 243.132 +static void floppy_off(unsigned int nr);
 243.133 +
 243.134 +#define DEVICE_NAME "floppy"
 243.135 +#define DEVICE_INTR do_floppy
 243.136 +#define DEVICE_REQUEST do_fd_request
 243.137 +#define DEVICE_NR(device) ( (MINOR(device) & 3) | ((MINOR(device) & 0x80 ) >> 5 ))
 243.138 +#define DEVICE_OFF(device) floppy_off(DEVICE_NR(device))
 243.139 +
 243.140 +#elif (MAJOR_NR == HD_MAJOR)
 243.141 +
 243.142 +/* Hard disk:  timeout is 6 seconds. */
 243.143 +#define DEVICE_NAME "hard disk"
 243.144 +#define DEVICE_INTR do_hd
 243.145 +#define TIMEOUT_VALUE (6*HZ)
 243.146 +#define DEVICE_REQUEST do_hd_request
 243.147 +#define DEVICE_NR(device) (MINOR(device)>>6)
 243.148 +
 243.149 +#elif (SCSI_DISK_MAJOR(MAJOR_NR))
 243.150 +
 243.151 +#define DEVICE_NAME "scsidisk"
 243.152 +#define TIMEOUT_VALUE (2*HZ)
 243.153 +#define DEVICE_NR(device) (((MAJOR(device) & SD_MAJOR_MASK) << (8 - 4)) + (MINOR(device) >> 4))
 243.154 +
 243.155 +/* Kludge to use the same number for both char and block major numbers */
 243.156 +#elif  (MAJOR_NR == MD_MAJOR) && defined(MD_DRIVER)
 243.157 +
 243.158 +#define DEVICE_NAME "Multiple devices driver"
 243.159 +#define DEVICE_REQUEST do_md_request
 243.160 +#define DEVICE_NR(device) (MINOR(device))
 243.161 +
 243.162 +#elif (MAJOR_NR == SCSI_TAPE_MAJOR)
 243.163 +
 243.164 +#define DEVICE_NAME "scsitape"
 243.165 +#define DEVICE_INTR do_st  
 243.166 +#define DEVICE_NR(device) (MINOR(device) & 0x7f)
 243.167 +
 243.168 +#elif (MAJOR_NR == OSST_MAJOR)
 243.169 +
 243.170 +#define DEVICE_NAME "onstream" 
 243.171 +#define DEVICE_INTR do_osst
 243.172 +#define DEVICE_NR(device) (MINOR(device) & 0x7f) 
 243.173 +#define DEVICE_ON(device) 
 243.174 +#define DEVICE_OFF(device) 
 243.175 +
 243.176 +#elif (MAJOR_NR == SCSI_CDROM_MAJOR)
 243.177 +
 243.178 +#define DEVICE_NAME "CD-ROM"
 243.179 +#define DEVICE_NR(device) (MINOR(device))
 243.180 +
 243.181 +#elif (MAJOR_NR == XT_DISK_MAJOR)
 243.182 +
 243.183 +#define DEVICE_NAME "xt disk"
 243.184 +#define DEVICE_REQUEST do_xd_request
 243.185 +#define DEVICE_NR(device) (MINOR(device) >> 6)
 243.186 +
 243.187 +#elif (MAJOR_NR == PS2ESDI_MAJOR)
 243.188 +
 243.189 +#define DEVICE_NAME "PS/2 ESDI"
 243.190 +#define DEVICE_REQUEST do_ps2esdi_request
 243.191 +#define DEVICE_NR(device) (MINOR(device) >> 6)
 243.192 +
 243.193 +#elif (MAJOR_NR == CDU31A_CDROM_MAJOR)
 243.194 +
 243.195 +#define DEVICE_NAME "CDU31A"
 243.196 +#define DEVICE_REQUEST do_cdu31a_request
 243.197 +#define DEVICE_NR(device) (MINOR(device))
 243.198 +
 243.199 +#elif (MAJOR_NR == ACSI_MAJOR) && (defined(CONFIG_ATARI_ACSI) || defined(CONFIG_ATARI_ACSI_MODULE))
 243.200 +
 243.201 +#define DEVICE_NAME "ACSI"
 243.202 +#define DEVICE_INTR do_acsi
 243.203 +#define DEVICE_REQUEST do_acsi_request
 243.204 +#define DEVICE_NR(device) (MINOR(device) >> 4)
 243.205 +
 243.206 +#elif (MAJOR_NR == MITSUMI_CDROM_MAJOR)
 243.207 +
 243.208 +#define DEVICE_NAME "Mitsumi CD-ROM"
 243.209 +/* #define DEVICE_INTR do_mcd */
 243.210 +#define DEVICE_REQUEST do_mcd_request
 243.211 +#define DEVICE_NR(device) (MINOR(device))
 243.212 +
 243.213 +#elif (MAJOR_NR == MITSUMI_X_CDROM_MAJOR)
 243.214 +
 243.215 +#define DEVICE_NAME "Mitsumi CD-ROM"
 243.216 +/* #define DEVICE_INTR do_mcdx */
 243.217 +#define DEVICE_REQUEST do_mcdx_request
 243.218 +#define DEVICE_NR(device) (MINOR(device))
 243.219 +
 243.220 +#elif (MAJOR_NR == MATSUSHITA_CDROM_MAJOR)
 243.221 +
 243.222 +#define DEVICE_NAME "Matsushita CD-ROM controller #1"
 243.223 +#define DEVICE_REQUEST do_sbpcd_request
 243.224 +#define DEVICE_NR(device) (MINOR(device))
 243.225 +
 243.226 +#elif (MAJOR_NR == MATSUSHITA_CDROM2_MAJOR)
 243.227 +
 243.228 +#define DEVICE_NAME "Matsushita CD-ROM controller #2"
 243.229 +#define DEVICE_REQUEST do_sbpcd2_request
 243.230 +#define DEVICE_NR(device) (MINOR(device))
 243.231 +
 243.232 +#elif (MAJOR_NR == MATSUSHITA_CDROM3_MAJOR)
 243.233 +
 243.234 +#define DEVICE_NAME "Matsushita CD-ROM controller #3"
 243.235 +#define DEVICE_REQUEST do_sbpcd3_request
 243.236 +#define DEVICE_NR(device) (MINOR(device))
 243.237 +
 243.238 +#elif (MAJOR_NR == MATSUSHITA_CDROM4_MAJOR)
 243.239 +
 243.240 +#define DEVICE_NAME "Matsushita CD-ROM controller #4"
 243.241 +#define DEVICE_REQUEST do_sbpcd4_request
 243.242 +#define DEVICE_NR(device) (MINOR(device))
 243.243 +
 243.244 +#elif (MAJOR_NR == AZTECH_CDROM_MAJOR)
 243.245 +
 243.246 +#define DEVICE_NAME "Aztech CD-ROM"
 243.247 +#define DEVICE_REQUEST do_aztcd_request
 243.248 +#define DEVICE_NR(device) (MINOR(device))
 243.249 +
 243.250 +#elif (MAJOR_NR == CDU535_CDROM_MAJOR)
 243.251 +
 243.252 +#define DEVICE_NAME "SONY-CDU535"
 243.253 +#define DEVICE_INTR do_cdu535
 243.254 +#define DEVICE_REQUEST do_cdu535_request
 243.255 +#define DEVICE_NR(device) (MINOR(device))
 243.256 +
 243.257 +#elif (MAJOR_NR == GOLDSTAR_CDROM_MAJOR)
 243.258 +
 243.259 +#define DEVICE_NAME "Goldstar R420"
 243.260 +#define DEVICE_REQUEST do_gscd_request
 243.261 +#define DEVICE_NR(device) (MINOR(device))
 243.262 +
 243.263 +#elif (MAJOR_NR == CM206_CDROM_MAJOR)
 243.264 +#define DEVICE_NAME "Philips/LMS CD-ROM cm206"
 243.265 +#define DEVICE_REQUEST do_cm206_request
 243.266 +#define DEVICE_NR(device) (MINOR(device))
 243.267 +
 243.268 +#elif (MAJOR_NR == OPTICS_CDROM_MAJOR)
 243.269 +
 243.270 +#define DEVICE_NAME "DOLPHIN 8000AT CD-ROM"
 243.271 +#define DEVICE_REQUEST do_optcd_request
 243.272 +#define DEVICE_NR(device) (MINOR(device))
 243.273 +
 243.274 +#elif (MAJOR_NR == SANYO_CDROM_MAJOR)
 243.275 +
 243.276 +#define DEVICE_NAME "Sanyo H94A CD-ROM"
 243.277 +#define DEVICE_REQUEST do_sjcd_request
 243.278 +#define DEVICE_NR(device) (MINOR(device))
 243.279 +
 243.280 +#elif (MAJOR_NR == APBLOCK_MAJOR)
 243.281 +
 243.282 +#define DEVICE_NAME "apblock"
 243.283 +#define DEVICE_REQUEST ap_request
 243.284 +#define DEVICE_NR(device) (MINOR(device))
 243.285 +
 243.286 +#elif (MAJOR_NR == DDV_MAJOR)
 243.287 +
 243.288 +#define DEVICE_NAME "ddv"
 243.289 +#define DEVICE_REQUEST ddv_request
 243.290 +#define DEVICE_NR(device) (MINOR(device)>>PARTN_BITS)
 243.291 +
 243.292 +#elif (MAJOR_NR == MFM_ACORN_MAJOR)
 243.293 +
 243.294 +#define DEVICE_NAME "mfm disk"
 243.295 +#define DEVICE_INTR do_mfm
 243.296 +#define DEVICE_REQUEST do_mfm_request
 243.297 +#define DEVICE_NR(device) (MINOR(device) >> 6)
 243.298 +
 243.299 +#elif (MAJOR_NR == NBD_MAJOR)
 243.300 +
 243.301 +#define DEVICE_NAME "nbd"
 243.302 +#define DEVICE_REQUEST do_nbd_request
 243.303 +#define DEVICE_NR(device) (MINOR(device))
 243.304 +
 243.305 +#elif (MAJOR_NR == MDISK_MAJOR)
 243.306 +
 243.307 +#define DEVICE_NAME "mdisk"
 243.308 +#define DEVICE_REQUEST mdisk_request
 243.309 +#define DEVICE_NR(device) (MINOR(device))
 243.310 +
 243.311 +#elif (MAJOR_NR == DASD_MAJOR)
 243.312 +
 243.313 +#define DEVICE_NAME "dasd"
 243.314 +#define DEVICE_REQUEST do_dasd_request
 243.315 +#define DEVICE_NR(device) (MINOR(device) >> PARTN_BITS)
 243.316 +
 243.317 +#elif (MAJOR_NR == I2O_MAJOR)
 243.318 +
 243.319 +#define DEVICE_NAME "I2O block"
 243.320 +#define DEVICE_REQUEST i2ob_request
 243.321 +#define DEVICE_NR(device) (MINOR(device)>>4)
 243.322 +
 243.323 +#elif (MAJOR_NR == COMPAQ_SMART2_MAJOR)
 243.324 +
 243.325 +#define DEVICE_NAME "ida"
 243.326 +#define TIMEOUT_VALUE (25*HZ)
 243.327 +#define DEVICE_REQUEST do_ida_request
 243.328 +#define DEVICE_NR(device) (MINOR(device) >> 4)
 243.329 +
 243.330 +#endif /* MAJOR_NR == whatever */
 243.331 +
 243.332 +/* provide DEVICE_xxx defaults, if not explicitly defined
 243.333 + * above in the MAJOR_NR==xxx if-elif tree */
 243.334 +#ifndef DEVICE_ON
 243.335 +#define DEVICE_ON(device) do {} while (0)
 243.336 +#endif
 243.337 +#ifndef DEVICE_OFF
 243.338 +#define DEVICE_OFF(device) do {} while (0)
 243.339 +#endif
 243.340 +
 243.341 +#if (MAJOR_NR != SCSI_TAPE_MAJOR) && (MAJOR_NR != OSST_MAJOR)
 243.342 +#if !defined(IDE_DRIVER)
 243.343 +
 243.344 +#ifndef CURRENT
 243.345 +#define CURRENT blkdev_entry_next_request(&blk_dev[MAJOR_NR].request_queue.queue_head)
 243.346 +#endif
 243.347 +#ifndef QUEUE_EMPTY
 243.348 +#define QUEUE_EMPTY list_empty(&blk_dev[MAJOR_NR].request_queue.queue_head)
 243.349 +#endif
 243.350 +
 243.351 +#ifndef DEVICE_NAME
 243.352 +#define DEVICE_NAME "unknown"
 243.353 +#endif
 243.354 +
 243.355 +#define CURRENT_DEV DEVICE_NR(CURRENT->rq_dev)
 243.356 +
 243.357 +#ifdef DEVICE_INTR
 243.358 +static void (*DEVICE_INTR)(void) = NULL;
 243.359 +#endif
 243.360 +
 243.361 +#define SET_INTR(x) (DEVICE_INTR = (x))
 243.362 +
 243.363 +#ifdef DEVICE_REQUEST
 243.364 +static void (DEVICE_REQUEST)(request_queue_t *);
 243.365 +#endif 
 243.366 +  
 243.367 +#ifdef DEVICE_INTR
 243.368 +#define CLEAR_INTR SET_INTR(NULL)
 243.369 +#else
 243.370 +#define CLEAR_INTR
 243.371 +#endif
 243.372 +
 243.373 +#define INIT_REQUEST \
 243.374 +	if (QUEUE_EMPTY) {\
 243.375 +		CLEAR_INTR; \
 243.376 +		return; \
 243.377 +	} \
 243.378 +	if (MAJOR(CURRENT->rq_dev) != MAJOR_NR) \
 243.379 +		panic(DEVICE_NAME ": request list destroyed"); \
 243.380 +	if (CURRENT->bh) { \
 243.381 +		if (!buffer_locked(CURRENT->bh)) \
 243.382 +			panic(DEVICE_NAME ": block not locked"); \
 243.383 +	}
 243.384 +
 243.385 +#endif /* !defined(IDE_DRIVER) */
 243.386 +
 243.387 +
 243.388 +#ifndef LOCAL_END_REQUEST	/* If we have our own end_request, we do not want to include this mess */
 243.389 +
 243.390 +#if ! SCSI_BLK_MAJOR(MAJOR_NR) && (MAJOR_NR != COMPAQ_SMART2_MAJOR)
 243.391 +
 243.392 +static inline void end_request(int uptodate) {
 243.393 +	struct request *req = CURRENT;
 243.394 +
 243.395 +	if (end_that_request_first(req, uptodate, DEVICE_NAME))
 243.396 +		return;
 243.397 +
 243.398 +#ifndef DEVICE_NO_RANDOM
 243.399 +	add_blkdev_randomness(MAJOR(req->rq_dev));
 243.400 +#endif
 243.401 +	DEVICE_OFF(req->rq_dev);
 243.402 +	blkdev_dequeue_request(req);
 243.403 +	end_that_request_last(req);
 243.404 +}
 243.405 +
 243.406 +#endif /* ! SCSI_BLK_MAJOR(MAJOR_NR) */
 243.407 +#endif /* LOCAL_END_REQUEST */
 243.408 +
 243.409 +#endif /* (MAJOR_NR != SCSI_TAPE_MAJOR) */
 243.410 +#endif /* defined(MAJOR_NR) || defined(IDE_DRIVER) */
 243.411 +
 243.412 +#endif /* _BLK_H */
   244.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   244.2 +++ b/xen/include/xen/blkdev.h	Tue Mar 23 09:48:06 2004 +0000
   244.3 @@ -0,0 +1,405 @@
   244.4 +#ifndef _LINUX_BLKDEV_H
   244.5 +#define _LINUX_BLKDEV_H
   244.6 +
   244.7 +#include <xen/lib.h>
   244.8 +#include <asm/atomic.h>
   244.9 +#include <asm/bitops.h>
  244.10 +#include <xen/list.h>
  244.11 +#include <xen/kdev_t.h>
  244.12 +#include <xen/sched.h>
  244.13 +#include <xen/mm.h>
  244.14 +
  244.15 +/* Some defines from fs.h that may actually be useful to the blkdev layer. */
  244.16 +#define READ 0
  244.17 +#define WRITE 1
  244.18 +#define READA 2
  244.19 +#define BLOCK_SIZE_BITS 10
  244.20 +#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
  244.21 +
  244.22 +typedef struct {
  244.23 +    struct task_struct *domain;
  244.24 +    unsigned long       id;
  244.25 +    atomic_t            pendcnt;
  244.26 +    unsigned short      operation;
  244.27 +    unsigned short      status;
  244.28 +} pending_req_t;
  244.29 +
  244.30 +extern kdev_t xendev_to_physdev(unsigned short xendev);
  244.31 +
  244.32 +extern void init_blkdev_info(struct task_struct *);
  244.33 +extern void unlink_blkdev_info(struct task_struct *);
  244.34 +extern void destroy_blkdev_info(struct task_struct *);
  244.35 +
  244.36 +extern int unregister_blkdev(unsigned int, const char *);
  244.37 +extern int invalidate_device(kdev_t, int);
  244.38 +extern int check_disk_change(kdev_t);
  244.39 +struct block_device;
  244.40 +extern void invalidate_bdev(struct block_device *, int);
  244.41 +
  244.42 +/*
  244.43 + * Metainformation regarding block devices is kept in inode and file
  244.44 + * structures. We don't actually want those so we define just as much 
  244.45 + * as we need right here.
  244.46 + */
  244.47 +struct file {
  244.48 +};
  244.49 +struct inode {
  244.50 +    kdev_t i_rdev; /* for _open and _release, specifies the blkdev */
  244.51 +    struct block_device *i_bdev;
  244.52 +};
  244.53 +
  244.54 +struct block_device_operations {
  244.55 +        int (*open) (struct inode *, struct file *);
  244.56 +        int (*release) (struct inode *, struct file *);
  244.57 +        int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long);
  244.58 +        int (*check_media_change) (kdev_t);
  244.59 +        int (*revalidate) (kdev_t);
  244.60 +};
  244.61 +
  244.62 +
  244.63 +enum bh_state_bits {
  244.64 +        BH_Uptodate,    /* 1 if the buffer contains valid data */
  244.65 +        BH_Dirty,       /* 1 if the buffer is dirty */
  244.66 +        BH_Lock,        /* 1 if the buffer is locked */
  244.67 +        BH_Req,         /* 0 if the buffer has been invalidated */
  244.68 +        BH_Mapped,      /* 1 if the buffer has a disk mapping */
  244.69 +        BH_New,         /* 1 if the buffer is new and not yet written out */
  244.70 +        BH_Async,       /* 1 if the buffer is under end_buffer_io_async I/O */
  244.71 +        BH_Wait_IO,     /* 1 if we should write out this buffer */
  244.72 +        BH_Launder,     /* 1 if we can throttle on this buffer */
  244.73 +        BH_JBD,         /* 1 if it has an attached journal_head */
  244.74 +        BH_Read,        /* 1 if request is a read from disc */
  244.75 +        BH_Write        /* 1 if request is a write to disc */
  244.76 +};
  244.77 +
  244.78 +struct buffer_head {
  244.79 +        unsigned long b_rsector;        /* Real buffer location on disk */
  244.80 +        unsigned short b_size;          /* block size */
  244.81 +        kdev_t b_dev;                   /* device (B_FREE = free) */
  244.82 +        unsigned long b_state;          /* buffer state bitmap (see above) */
  244.83 +        struct buffer_head *b_reqnext;  /* request queue */
  244.84 +        char *b_data;                   /* pointer to data block */
  244.85 +	struct pfn_info *b_page;        /* the page this bh is mapped to */
  244.86 +        void (*b_end_io)(struct buffer_head *bh, int uptodate);
  244.87 +        pending_req_t *pending_req;
  244.88 +};
  244.89 +
  244.90 +#define b_rdev b_dev /* In Xen, there's no device layering (eg. s/w RAID). */
  244.91 +
  244.92 +typedef void (bh_end_io_t)(struct buffer_head *bh, int uptodate);
  244.93 +void init_buffer(struct buffer_head *, bh_end_io_t *, void *);
  244.94 +
  244.95 +#define __buffer_state(bh, state)       (((bh)->b_state & (1UL << BH_##state)) != 0)
  244.96 +
  244.97 +#define buffer_uptodate(bh)     __buffer_state(bh,Uptodate)
  244.98 +#define buffer_dirty(bh)        __buffer_state(bh,Dirty)
  244.99 +#define buffer_locked(bh)       __buffer_state(bh,Lock)
 244.100 +#define buffer_req(bh)          __buffer_state(bh,Req)
 244.101 +#define buffer_mapped(bh)       __buffer_state(bh,Mapped)
 244.102 +#define buffer_new(bh)          __buffer_state(bh,New)
 244.103 +#define buffer_async(bh)        __buffer_state(bh,Async)
 244.104 +#define buffer_launder(bh)      __buffer_state(bh,Launder)
 244.105 +
 244.106 +#define bh_offset(bh)           ((unsigned long)(bh)->b_data & ~PAGE_MASK)
 244.107 +
 244.108 +extern void set_bh_page(struct buffer_head *bh, struct pfn_info *page, unsigned long offset);
 244.109 +
 244.110 +#define atomic_set_buffer_clean(bh) test_and_clear_bit(BH_Dirty, &(bh)->b_state)
 244.111 +
 244.112 +static inline void __mark_buffer_clean(struct buffer_head *bh)
 244.113 +{
 244.114 +    panic("__mark_buffer_clean");
 244.115 +}
 244.116 +
 244.117 +static inline void mark_buffer_clean(struct buffer_head * bh)
 244.118 +{
 244.119 +        if (atomic_set_buffer_clean(bh))
 244.120 +                __mark_buffer_clean(bh);
 244.121 +}
 244.122 +
 244.123 +static inline void buffer_IO_error(struct buffer_head * bh)
 244.124 +{
 244.125 +    mark_buffer_clean(bh);
 244.126 +    /* b_end_io has to clear the BH_Uptodate bitflag in the error case! */
 244.127 +    bh->b_end_io(bh, 0);
 244.128 +}
 244.129 +
 244.130 +/**** XXX END OF BUFFER_HEAD STUFF XXXX ****/
 244.131 +
 244.132 +#include <xen/major.h>
 244.133 +#include <xen/sched.h>
 244.134 +#include <xen/genhd.h>
 244.135 +#include <xen/tqueue.h>
 244.136 +#include <xen/list.h>
 244.137 +
 244.138 +struct request_queue;
 244.139 +typedef struct request_queue request_queue_t;
 244.140 +struct elevator_s;
 244.141 +typedef struct elevator_s elevator_t;
 244.142 +
 244.143 +/*
 244.144 + * Ok, this is an expanded form so that we can use the same
 244.145 + * request for paging requests.
 244.146 + */
 244.147 +struct request {
 244.148 +	struct list_head queue;
 244.149 +	int elevator_sequence;
 244.150 +
 244.151 +	volatile int rq_status;	/* should split this into a few status bits */
 244.152 +#define RQ_INACTIVE		(-1)
 244.153 +#define RQ_ACTIVE		1
 244.154 +#define RQ_SCSI_BUSY		0xffff
 244.155 +#define RQ_SCSI_DONE		0xfffe
 244.156 +#define RQ_SCSI_DISCONNECTING	0xffe0
 244.157 +
 244.158 +	kdev_t rq_dev;
 244.159 +	int cmd;		/* READ or WRITE */
 244.160 +	int errors;
 244.161 +	unsigned long start_time;
 244.162 +	unsigned long sector;
 244.163 +	unsigned long nr_sectors;
 244.164 +	unsigned long hard_sector, hard_nr_sectors;
 244.165 +	unsigned int nr_segments;
 244.166 +	unsigned int nr_hw_segments;
 244.167 +	unsigned long current_nr_sectors;
 244.168 +	void * special;
 244.169 +	char * buffer;
 244.170 +	struct completion * waiting;
 244.171 +	struct buffer_head * bh;
 244.172 +	struct buffer_head * bhtail;
 244.173 +	request_queue_t *q;
 244.174 +};
 244.175 +
 244.176 +#include <xen/elevator.h>
 244.177 +
 244.178 +typedef int (merge_request_fn) (request_queue_t *q, 
 244.179 +				struct request  *req,
 244.180 +				struct buffer_head *bh,
 244.181 +				int);
 244.182 +typedef int (merge_requests_fn) (request_queue_t *q, 
 244.183 +				 struct request  *req,
 244.184 +				 struct request  *req2,
 244.185 +				 int);
 244.186 +typedef void (request_fn_proc) (request_queue_t *q);
 244.187 +typedef request_queue_t * (queue_proc) (kdev_t dev);
 244.188 +typedef int (make_request_fn) (request_queue_t *q, int rw, struct buffer_head *bh);
 244.189 +typedef void (plug_device_fn) (request_queue_t *q, kdev_t device);
 244.190 +typedef void (unplug_device_fn) (void *q);
 244.191 +
 244.192 +/*
 244.193 + * Default nr free requests per queue, ll_rw_blk will scale it down
 244.194 + * according to available RAM at init time
 244.195 + */
 244.196 +#define QUEUE_NR_REQUESTS	8192
 244.197 +
 244.198 +struct request_list {
 244.199 +	unsigned int count;
 244.200 +	struct list_head free;
 244.201 +};
 244.202 +
 244.203 +struct request_queue
 244.204 +{
 244.205 +	/*
 244.206 +	 * the queue request freelist, one for reads and one for writes
 244.207 +	 */
 244.208 +	struct request_list	rq[2];
 244.209 +
 244.210 +	/*
 244.211 +	 * The total number of requests on each queue
 244.212 +	 */
 244.213 +	int nr_requests;
 244.214 +
 244.215 +	/*
 244.216 +	 * Batching threshold for sleep/wakeup decisions
 244.217 +	 */
 244.218 +	int batch_requests;
 244.219 +
 244.220 +	/*
 244.221 +	 * Together with queue_head for cacheline sharing
 244.222 +	 */
 244.223 +	struct list_head	queue_head;
 244.224 +	elevator_t		elevator;
 244.225 +
 244.226 +	request_fn_proc		* request_fn;
 244.227 +	merge_request_fn	* back_merge_fn;
 244.228 +	merge_request_fn	* front_merge_fn;
 244.229 +	merge_requests_fn	* merge_requests_fn;
 244.230 +	make_request_fn		* make_request_fn;
 244.231 +	plug_device_fn		* plug_device_fn;
 244.232 +	/*
 244.233 +	 * The queue owner gets to use this for whatever they like.
 244.234 +	 * ll_rw_blk doesn't touch it.
 244.235 +	 */
 244.236 +	void			* queuedata;
 244.237 +
 244.238 +	/*
 244.239 +	 * This is used to remove the plug when tq_disk runs.
 244.240 +	 */
 244.241 +	struct tq_struct	plug_tq;
 244.242 +
 244.243 +	/*
 244.244 +	 * Boolean that indicates whether this queue is plugged or not.
 244.245 +	 */
 244.246 +	char			plugged;
 244.247 +
 244.248 +	/*
 244.249 +	 * Boolean that indicates whether current_request is active or
 244.250 +	 * not.
 244.251 +	 */
 244.252 +	char			head_active;
 244.253 +
 244.254 +	unsigned long bounce_pfn; // XXX SMH: backported from 2.4.24
 244.255 +
 244.256 +	/*
 244.257 +	 * Is meant to protect the queue in the future instead of
 244.258 +	 * io_request_lock
 244.259 +	 */
 244.260 +	spinlock_t		queue_lock;
 244.261 +
 244.262 +#if 0
 244.263 +	/*
 244.264 +	 * Tasks wait here for free read and write requests
 244.265 +	 */
 244.266 +	wait_queue_head_t	wait_for_requests[2];
 244.267 +#endif
 244.268 +};
 244.269 +
 244.270 +
 244.271 +
 244.272 +#ifdef CONFIG_HIGHMEM
 244.273 +extern struct buffer_head *create_bounce(int, struct buffer_head *);
 244.274 +extern inline struct buffer_head *blk_queue_bounce(request_queue_t *q, int rw,
 244.275 +						   struct buffer_head *bh)
 244.276 +{
 244.277 +	struct page *page = bh->b_page;
 244.278 +
 244.279 +#ifndef CONFIG_DISCONTIGMEM
 244.280 +	if (page - mem_map <= q->bounce_pfn)
 244.281 +#else
 244.282 +	if ((page - page_zone(page)->zone_mem_map) + (page_zone(page)->zone_start_paddr >> PAGE_SHIFT) <= q->bounce_pfn)
 244.283 +#endif
 244.284 +		return bh;
 244.285 +
 244.286 +	return create_bounce(rw, bh);
 244.287 +}
 244.288 +#else
 244.289 +#define blk_queue_bounce(q, rw, bh)	(bh)
 244.290 +#endif
 244.291 +
 244.292 +#define bh_phys(bh)		(page_to_phys((bh)->b_page) + bh_offset((bh)))
 244.293 +
 244.294 +#define BH_CONTIG(b1, b2)	(bh_phys((b1)) + (b1)->b_size == bh_phys((b2)))
 244.295 +#define BH_PHYS_4G(b1, b2)	((bh_phys((b1)) | 0xffffffff) == ((bh_phys((b2)) + (b2)->b_size - 1) | 0xffffffff))
 244.296 +
 244.297 +
 244.298 +struct blk_dev_struct {
 244.299 +	/*
 244.300 +	 * queue_proc has to be atomic
 244.301 +	 */
 244.302 +	request_queue_t		request_queue;
 244.303 +	queue_proc		*queue;
 244.304 +	void			*data;
 244.305 +};
 244.306 +
 244.307 +struct sec_size {
 244.308 +	unsigned block_size;
 244.309 +	unsigned block_size_bits;
 244.310 +};
 244.311 +
 244.312 +/*
 244.313 + * Used to indicate the default queue for drivers that don't bother
 244.314 + * to implement multiple queues.  We have this access macro here
 244.315 + * so as to eliminate the need for each and every block device
 244.316 + * driver to know about the internal structure of blk_dev[].
 244.317 + */
 244.318 +#define BLK_DEFAULT_QUEUE(_MAJOR)  &blk_dev[_MAJOR].request_queue
 244.319 +
 244.320 +extern struct sec_size * blk_sec[MAX_BLKDEV];
 244.321 +extern struct blk_dev_struct blk_dev[MAX_BLKDEV];
 244.322 +extern void grok_partitions(struct gendisk *dev, int drive, unsigned minors, long size);
 244.323 +extern void register_disk(struct gendisk *dev, kdev_t first, unsigned minors, struct block_device_operations *ops, long size);
 244.324 +extern void generic_make_request(int rw, struct buffer_head * bh);
 244.325 +extern inline request_queue_t *blk_get_queue(kdev_t dev);
 244.326 +extern void blkdev_release_request(struct request *);
 244.327 +
 244.328 +/*
 244.329 + * Access functions for manipulating queue properties
 244.330 + */
 244.331 +extern int blk_grow_request_list(request_queue_t *q, int nr_requests);
 244.332 +extern void blk_init_queue(request_queue_t *, request_fn_proc *);
 244.333 +extern void blk_cleanup_queue(request_queue_t *);
 244.334 +extern void blk_queue_headactive(request_queue_t *, int);
 244.335 +extern void blk_queue_make_request(request_queue_t *, make_request_fn *);
 244.336 +extern void generic_unplug_device(void *);
 244.337 +extern inline int blk_seg_merge_ok(struct buffer_head *, struct buffer_head *);
 244.338 +
 244.339 +extern int * blk_size[MAX_BLKDEV];
 244.340 +
 244.341 +extern int * blksize_size[MAX_BLKDEV];
 244.342 +
 244.343 +extern int * hardsect_size[MAX_BLKDEV];
 244.344 +
 244.345 +/*extern int * max_readahead[MAX_BLKDEV];*/
 244.346 +
 244.347 +extern int * max_sectors[MAX_BLKDEV];
 244.348 +
 244.349 +extern int * max_segments[MAX_BLKDEV];
 244.350 +
 244.351 +extern int read_ahead[];
 244.352 +
 244.353 +#define MAX_SEGMENTS 128
 244.354 +#define MAX_SECTORS 255
 244.355 +
 244.356 +#define PageAlignSize(size) (((size) + PAGE_SIZE -1) & PAGE_MASK)
 244.357 +
 244.358 +#define blkdev_entry_to_request(entry) list_entry((entry), struct request, queue)
 244.359 +#define blkdev_entry_next_request(entry) blkdev_entry_to_request((entry)->next)
 244.360 +#define blkdev_entry_prev_request(entry) blkdev_entry_to_request((entry)->prev)
 244.361 +#define blkdev_next_request(req) blkdev_entry_to_request((req)->queue.next)
 244.362 +#define blkdev_prev_request(req) blkdev_entry_to_request((req)->queue.prev)
 244.363 +
 244.364 +extern void drive_stat_acct (kdev_t dev, int rw,
 244.365 +					unsigned long nr_sectors, int new_io);
 244.366 +
 244.367 +static inline int get_hardsect_size(kdev_t dev)
 244.368 +{
 244.369 +	int retval = 512;
 244.370 +	int major = MAJOR(dev);
 244.371 +
 244.372 +	if (hardsect_size[major]) {
 244.373 +		int minor = MINOR(dev);
 244.374 +		if (hardsect_size[major][minor])
 244.375 +			retval = hardsect_size[major][minor];
 244.376 +	}
 244.377 +	return retval;
 244.378 +}
 244.379 +
 244.380 +#define blk_finished_io(nsects)	do { } while (0)
 244.381 +#define blk_started_io(nsects)	do { } while (0)
 244.382 +
 244.383 +static inline unsigned int blksize_bits(unsigned int size)
 244.384 +{
 244.385 +	unsigned int bits = 8;
 244.386 +	do {
 244.387 +		bits++;
 244.388 +		size >>= 1;
 244.389 +	} while (size > 256);
 244.390 +	return bits;
 244.391 +}
 244.392 +
 244.393 +static inline unsigned int block_size(kdev_t dev)
 244.394 +{
 244.395 +	int retval = BLOCK_SIZE;
 244.396 +	int major = MAJOR(dev);
 244.397 +
 244.398 +	if (blksize_size[major]) {
 244.399 +		int minor = MINOR(dev);
 244.400 +		if (blksize_size[major][minor])
 244.401 +			retval = blksize_size[major][minor];
 244.402 +	}
 244.403 +	return retval;
 244.404 +}
 244.405 +
 244.406 +
 244.407 +
 244.408 +#endif
   245.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   245.2 +++ b/xen/include/xen/blkpg.h	Tue Mar 23 09:48:06 2004 +0000
   245.3 @@ -0,0 +1,64 @@
   245.4 +#ifndef _LINUX_BLKPG_H
   245.5 +#define _LINUX_BLKPG_H
   245.6 +
   245.7 +/*
   245.8 + * Partition table and disk geometry handling
   245.9 + *
  245.10 + * A single ioctl with lots of subfunctions:
  245.11 + *
  245.12 + * Device number stuff:
  245.13 + *    get_whole_disk()		(given the device number of a partition,
  245.14 + *                               find the device number of the encompassing disk)
  245.15 + *    get_all_partitions()	(given the device number of a disk, return the
  245.16 + *				 device numbers of all its known partitions)
  245.17 + *
  245.18 + * Partition stuff:
  245.19 + *    add_partition()
  245.20 + *    delete_partition()
  245.21 + *    test_partition_in_use()	(also for test_disk_in_use)
  245.22 + *
  245.23 + * Geometry stuff:
  245.24 + *    get_geometry()
  245.25 + *    set_geometry()
  245.26 + *    get_bios_drivedata()
  245.27 + *
  245.28 + * For today, only the partition stuff - aeb, 990515
  245.29 + */
  245.30 +#include <xen/ioctl.h>
  245.31 +
  245.32 +#define BLKPG      _IO(0x12,105)
  245.33 +
  245.34 +/* The argument structure */
  245.35 +struct blkpg_ioctl_arg {
  245.36 +        int op;
  245.37 +        int flags;
  245.38 +        int datalen;
  245.39 +        void *data;
  245.40 +};
  245.41 +
  245.42 +/* The subfunctions (for the op field) */
  245.43 +#define BLKPG_ADD_PARTITION	1
  245.44 +#define BLKPG_DEL_PARTITION	2
  245.45 +
  245.46 +/* Sizes of name fields. Unused at present. */
  245.47 +#define BLKPG_DEVNAMELTH	64
  245.48 +#define BLKPG_VOLNAMELTH	64
  245.49 +
  245.50 +/* The data structure for ADD_PARTITION and DEL_PARTITION */
  245.51 +struct blkpg_partition {
  245.52 +	long long start;		/* starting offset in bytes */
  245.53 +	long long length;		/* length in bytes */
  245.54 +	int pno;			/* partition number */
  245.55 +	char devname[BLKPG_DEVNAMELTH];	/* partition name, like sda5 or c0d1p2,
  245.56 +					   to be used in kernel messages */
  245.57 +	char volname[BLKPG_VOLNAMELTH];	/* volume label */
  245.58 +};
  245.59 +
  245.60 +#ifdef __KERNEL__
  245.61 +
  245.62 +extern char * partition_name(kdev_t dev);
  245.63 +extern int blk_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg);
  245.64 +
  245.65 +#endif /* __KERNEL__ */
  245.66 +
  245.67 +#endif /* _LINUX_BLKPG_H */
   246.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   246.2 +++ b/xen/include/xen/brlock.h	Tue Mar 23 09:48:06 2004 +0000
   246.3 @@ -0,0 +1,220 @@
   246.4 +#ifndef __LINUX_BRLOCK_H
   246.5 +#define __LINUX_BRLOCK_H
   246.6 +
   246.7 +/*
   246.8 + * 'Big Reader' read-write spinlocks.
   246.9 + *
  246.10 + * super-fast read/write locks, with write-side penalty. The point
  246.11 + * is to have a per-CPU read/write lock. Readers lock their CPU-local
  246.12 + * readlock, writers must lock all locks to get write access. These
  246.13 + * CPU-read-write locks are semantically identical to normal rwlocks.
  246.14 + * Memory usage is higher as well. (NR_CPUS*L1_CACHE_BYTES bytes)
  246.15 + *
  246.16 + * The most important feature is that these spinlocks do not cause
  246.17 + * cacheline ping-pong in the 'most readonly data' case.
  246.18 + *
  246.19 + * Copyright 2000, Ingo Molnar <mingo@redhat.com>
  246.20 + *
  246.21 + * Registry idea and naming [ crutial! :-) ] by:
  246.22 + *
  246.23 + *                 David S. Miller <davem@redhat.com>
  246.24 + *
  246.25 + * David has an implementation that doesnt use atomic operations in
  246.26 + * the read branch via memory ordering tricks - i guess we need to
  246.27 + * split this up into a per-arch thing? The atomicity issue is a
  246.28 + * secondary item in profiles, at least on x86 platforms.
  246.29 + *
  246.30 + * The atomic op version overhead is indeed a big deal on
  246.31 + * load-locked/store-conditional cpus (ALPHA/MIPS/PPC) and
  246.32 + * compare-and-swap cpus (Sparc64).  So we control which
  246.33 + * implementation to use with a __BRLOCK_USE_ATOMICS define. -DaveM
  246.34 + */
  246.35 +
  246.36 +/* Register bigreader lock indices here. */
  246.37 +enum brlock_indices {
  246.38 +	BR_GLOBALIRQ_LOCK,
  246.39 +	BR_NETPROTO_LOCK,
  246.40 +
  246.41 +	__BR_END
  246.42 +};
  246.43 +
  246.44 +#include <xen/config.h>
  246.45 +
  246.46 +#ifdef CONFIG_SMP
  246.47 +
  246.48 +#include <xen/cache.h>
  246.49 +#include <xen/spinlock.h>
  246.50 +
  246.51 +#if defined(__i386__) || defined(__ia64__) || defined(__x86_64__)
  246.52 +#define __BRLOCK_USE_ATOMICS
  246.53 +#else
  246.54 +#undef __BRLOCK_USE_ATOMICS
  246.55 +#endif
  246.56 +
  246.57 +#ifdef __BRLOCK_USE_ATOMICS
  246.58 +typedef rwlock_t	brlock_read_lock_t;
  246.59 +#else
  246.60 +typedef unsigned int	brlock_read_lock_t;
  246.61 +#endif
  246.62 +
  246.63 +/*
  246.64 + * align last allocated index to the next cacheline:
  246.65 + */
  246.66 +#define __BR_IDX_MAX \
  246.67 +	(((sizeof(brlock_read_lock_t)*__BR_END + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1)) / sizeof(brlock_read_lock_t))
  246.68 +
  246.69 +extern brlock_read_lock_t __brlock_array[NR_CPUS][__BR_IDX_MAX];
  246.70 +
  246.71 +#ifndef __BRLOCK_USE_ATOMICS
  246.72 +struct br_wrlock {
  246.73 +	spinlock_t lock;
  246.74 +} __attribute__ ((__aligned__(SMP_CACHE_BYTES)));
  246.75 +
  246.76 +extern struct br_wrlock __br_write_locks[__BR_IDX_MAX];
  246.77 +#endif
  246.78 +
  246.79 +extern void __br_lock_usage_bug (void);
  246.80 +
  246.81 +#ifdef __BRLOCK_USE_ATOMICS
  246.82 +
  246.83 +static inline void br_read_lock (enum brlock_indices idx)
  246.84 +{
  246.85 +	/*
  246.86 +	 * This causes a link-time bug message if an
  246.87 +	 * invalid index is used:
  246.88 +	 */
  246.89 +	if (idx >= __BR_END)
  246.90 +		__br_lock_usage_bug();
  246.91 +
  246.92 +	read_lock(&__brlock_array[smp_processor_id()][idx]);
  246.93 +}
  246.94 +
  246.95 +static inline void br_read_unlock (enum brlock_indices idx)
  246.96 +{
  246.97 +	if (idx >= __BR_END)
  246.98 +		__br_lock_usage_bug();
  246.99 +
 246.100 +	read_unlock(&__brlock_array[smp_processor_id()][idx]);
 246.101 +}
 246.102 +
 246.103 +#else /* ! __BRLOCK_USE_ATOMICS */
 246.104 +static inline void br_read_lock (enum brlock_indices idx)
 246.105 +{
 246.106 +	unsigned int *ctr;
 246.107 +	spinlock_t *lock;
 246.108 +
 246.109 +	/*
 246.110 +	 * This causes a link-time bug message if an
 246.111 +	 * invalid index is used:
 246.112 +	 */
 246.113 +	if (idx >= __BR_END)
 246.114 +		__br_lock_usage_bug();
 246.115 +
 246.116 +	ctr = &__brlock_array[smp_processor_id()][idx];
 246.117 +	lock = &__br_write_locks[idx].lock;
 246.118 +again:
 246.119 +	(*ctr)++;
 246.120 +	mb();
 246.121 +	if (spin_is_locked(lock)) {
 246.122 +		(*ctr)--;
 246.123 +		wmb(); /*
 246.124 +			* The release of the ctr must become visible
 246.125 +			* to the other cpus eventually thus wmb(),
 246.126 +			* we don't care if spin_is_locked is reordered
 246.127 +			* before the releasing of the ctr.
 246.128 +			* However IMHO this wmb() is superflous even in theory.
 246.129 +			* It would not be superflous only if on the
 246.130 +			* other CPUs doing a ldl_l instead of an ldl
 246.131 +			* would make a difference and I don't think this is
 246.132 +			* the case.
 246.133 +			* I'd like to clarify this issue further
 246.134 +			* but for now this is a slow path so adding the
 246.135 +			* wmb() will keep us on the safe side.
 246.136 +			*/
 246.137 +		while (spin_is_locked(lock))
 246.138 +			barrier();
 246.139 +		goto again;
 246.140 +	}
 246.141 +}
 246.142 +
 246.143 +static inline void br_read_unlock (enum brlock_indices idx)
 246.144 +{
 246.145 +	unsigned int *ctr;
 246.146 +
 246.147 +	if (idx >= __BR_END)
 246.148 +		__br_lock_usage_bug();
 246.149 +
 246.150 +	ctr = &__brlock_array[smp_processor_id()][idx];
 246.151 +
 246.152 +	wmb();
 246.153 +	(*ctr)--;
 246.154 +}
 246.155 +#endif /* __BRLOCK_USE_ATOMICS */
 246.156 +
 246.157 +/* write path not inlined - it's rare and larger */
 246.158 +
 246.159 +extern void FASTCALL(__br_write_lock (enum brlock_indices idx));
 246.160 +extern void FASTCALL(__br_write_unlock (enum brlock_indices idx));
 246.161 +
 246.162 +static inline void br_write_lock (enum brlock_indices idx)
 246.163 +{
 246.164 +	if (idx >= __BR_END)
 246.165 +		__br_lock_usage_bug();
 246.166 +	__br_write_lock(idx);
 246.167 +}
 246.168 +
 246.169 +static inline void br_write_unlock (enum brlock_indices idx)
 246.170 +{
 246.171 +	if (idx >= __BR_END)
 246.172 +		__br_lock_usage_bug();
 246.173 +	__br_write_unlock(idx);
 246.174 +}
 246.175 +
 246.176 +#else
 246.177 +# define br_read_lock(idx)	((void)(idx))
 246.178 +# define br_read_unlock(idx)	((void)(idx))
 246.179 +# define br_write_lock(idx)	((void)(idx))
 246.180 +# define br_write_unlock(idx)	((void)(idx))
 246.181 +#endif
 246.182 +
 246.183 +/*
 246.184 + * Now enumerate all of the possible sw/hw IRQ protected
 246.185 + * versions of the interfaces.
 246.186 + */
 246.187 +#define br_read_lock_irqsave(idx, flags) \
 246.188 +	do { local_irq_save(flags); br_read_lock(idx); } while (0)
 246.189 +
 246.190 +#define br_read_lock_irq(idx) \
 246.191 +	do { local_irq_disable(); br_read_lock(idx); } while (0)
 246.192 +
 246.193 +#define br_read_lock_bh(idx) \
 246.194 +	do { local_bh_disable(); br_read_lock(idx); } while (0)
 246.195 +
 246.196 +#define br_write_lock_irqsave(idx, flags) \
 246.197 +	do { local_irq_save(flags); br_write_lock(idx); } while (0)
 246.198 +
 246.199 +#define br_write_lock_irq(idx) \
 246.200 +	do { local_irq_disable(); br_write_lock(idx); } while (0)
 246.201 +
 246.202 +#define br_write_lock_bh(idx) \
 246.203 +	do { local_bh_disable(); br_write_lock(idx); } while (0)
 246.204 +
 246.205 +#define br_read_unlock_irqrestore(idx, flags) \
 246.206 +	do { br_read_unlock(irx); local_irq_restore(flags); } while (0)
 246.207 +
 246.208 +#define br_read_unlock_irq(idx) \
 246.209 +	do { br_read_unlock(idx); local_irq_enable(); } while (0)
 246.210 +
 246.211 +#define br_read_unlock_bh(idx) \
 246.212 +	do { br_read_unlock(idx); local_bh_enable(); } while (0)
 246.213 +
 246.214 +#define br_write_unlock_irqrestore(idx, flags) \
 246.215 +	do { br_write_unlock(irx); local_irq_restore(flags); } while (0)
 246.216 +
 246.217 +#define br_write_unlock_irq(idx) \
 246.218 +	do { br_write_unlock(idx); local_irq_enable(); } while (0)
 246.219 +
 246.220 +#define br_write_unlock_bh(idx) \
 246.221 +	do { br_write_unlock(idx); local_bh_enable(); } while (0)
 246.222 +
 246.223 +#endif /* __LINUX_BRLOCK_H */
   247.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   247.2 +++ b/xen/include/xen/byteorder/big_endian.h	Tue Mar 23 09:48:06 2004 +0000
   247.3 @@ -0,0 +1,68 @@
   247.4 +#ifndef _LINUX_BYTEORDER_BIG_ENDIAN_H
   247.5 +#define _LINUX_BYTEORDER_BIG_ENDIAN_H
   247.6 +
   247.7 +#ifndef __BIG_ENDIAN
   247.8 +#define __BIG_ENDIAN 4321
   247.9 +#endif
  247.10 +#ifndef __BIG_ENDIAN_BITFIELD
  247.11 +#define __BIG_ENDIAN_BITFIELD
  247.12 +#endif
  247.13 +
  247.14 +#include <xen/byteorder/swab.h>
  247.15 +
  247.16 +#define __constant_htonl(x) ((__u32)(x))
  247.17 +#define __constant_ntohl(x) ((__u32)(x))
  247.18 +#define __constant_htons(x) ((__u16)(x))
  247.19 +#define __constant_ntohs(x) ((__u16)(x))
  247.20 +#define __constant_cpu_to_le64(x) ___constant_swab64((x))
  247.21 +#define __constant_le64_to_cpu(x) ___constant_swab64((x))
  247.22 +#define __constant_cpu_to_le32(x) ___constant_swab32((x))
  247.23 +#define __constant_le32_to_cpu(x) ___constant_swab32((x))
  247.24 +#define __constant_cpu_to_le16(x) ___constant_swab16((x))
  247.25 +#define __constant_le16_to_cpu(x) ___constant_swab16((x))
  247.26 +#define __constant_cpu_to_be64(x) ((__u64)(x))
  247.27 +#define __constant_be64_to_cpu(x) ((__u64)(x))
  247.28 +#define __constant_cpu_to_be32(x) ((__u32)(x))
  247.29 +#define __constant_be32_to_cpu(x) ((__u32)(x))
  247.30 +#define __constant_cpu_to_be16(x) ((__u16)(x))
  247.31 +#define __constant_be16_to_cpu(x) ((__u16)(x))
  247.32 +#define __cpu_to_le64(x) __swab64((x))
  247.33 +#define __le64_to_cpu(x) __swab64((x))
  247.34 +#define __cpu_to_le32(x) __swab32((x))
  247.35 +#define __le32_to_cpu(x) __swab32((x))
  247.36 +#define __cpu_to_le16(x) __swab16((x))
  247.37 +#define __le16_to_cpu(x) __swab16((x))
  247.38 +#define __cpu_to_be64(x) ((__u64)(x))
  247.39 +#define __be64_to_cpu(x) ((__u64)(x))
  247.40 +#define __cpu_to_be32(x) ((__u32)(x))
  247.41 +#define __be32_to_cpu(x) ((__u32)(x))
  247.42 +#define __cpu_to_be16(x) ((__u16)(x))
  247.43 +#define __be16_to_cpu(x) ((__u16)(x))
  247.44 +#define __cpu_to_le64p(x) __swab64p((x))
  247.45 +#define __le64_to_cpup(x) __swab64p((x))
  247.46 +#define __cpu_to_le32p(x) __swab32p((x))
  247.47 +#define __le32_to_cpup(x) __swab32p((x))
  247.48 +#define __cpu_to_le16p(x) __swab16p((x))
  247.49 +#define __le16_to_cpup(x) __swab16p((x))
  247.50 +#define __cpu_to_be64p(x) (*(__u64*)(x))
  247.51 +#define __be64_to_cpup(x) (*(__u64*)(x))
  247.52 +#define __cpu_to_be32p(x) (*(__u32*)(x))
  247.53 +#define __be32_to_cpup(x) (*(__u32*)(x))
  247.54 +#define __cpu_to_be16p(x) (*(__u16*)(x))
  247.55 +#define __be16_to_cpup(x) (*(__u16*)(x))
  247.56 +#define __cpu_to_le64s(x) __swab64s((x))
  247.57 +#define __le64_to_cpus(x) __swab64s((x))
  247.58 +#define __cpu_to_le32s(x) __swab32s((x))
  247.59 +#define __le32_to_cpus(x) __swab32s((x))
  247.60 +#define __cpu_to_le16s(x) __swab16s((x))
  247.61 +#define __le16_to_cpus(x) __swab16s((x))
  247.62 +#define __cpu_to_be64s(x) do {} while (0)
  247.63 +#define __be64_to_cpus(x) do {} while (0)
  247.64 +#define __cpu_to_be32s(x) do {} while (0)
  247.65 +#define __be32_to_cpus(x) do {} while (0)
  247.66 +#define __cpu_to_be16s(x) do {} while (0)
  247.67 +#define __be16_to_cpus(x) do {} while (0)
  247.68 +
  247.69 +#include <xen/byteorder/generic.h>
  247.70 +
  247.71 +#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */
   248.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   248.2 +++ b/xen/include/xen/byteorder/generic.h	Tue Mar 23 09:48:06 2004 +0000
   248.3 @@ -0,0 +1,180 @@
   248.4 +#ifndef _LINUX_BYTEORDER_GENERIC_H
   248.5 +#define _LINUX_BYTEORDER_GENERIC_H
   248.6 +
   248.7 +/*
   248.8 + * linux/byteorder_generic.h
   248.9 + * Generic Byte-reordering support
  248.10 + *
  248.11 + * Francois-Rene Rideau <fare@tunes.org> 19970707
  248.12 + *    gathered all the good ideas from all asm-foo/byteorder.h into one file,
  248.13 + *    cleaned them up.
  248.14 + *    I hope it is compliant with non-GCC compilers.
  248.15 + *    I decided to put __BYTEORDER_HAS_U64__ in byteorder.h,
  248.16 + *    because I wasn't sure it would be ok to put it in types.h
  248.17 + *    Upgraded it to 2.1.43
  248.18 + * Francois-Rene Rideau <fare@tunes.org> 19971012
  248.19 + *    Upgraded it to 2.1.57
  248.20 + *    to please Linus T., replaced huge #ifdef's between little/big endian
  248.21 + *    by nestedly #include'd files.
  248.22 + * Francois-Rene Rideau <fare@tunes.org> 19971205
  248.23 + *    Made it to 2.1.71; now a facelift:
  248.24 + *    Put files under include/linux/byteorder/
  248.25 + *    Split swab from generic support.
  248.26 + *
  248.27 + * TODO:
  248.28 + *   = Regular kernel maintainers could also replace all these manual
  248.29 + *    byteswap macros that remain, disseminated among drivers,
  248.30 + *    after some grep or the sources...
  248.31 + *   = Linus might want to rename all these macros and files to fit his taste,
  248.32 + *    to fit his personal naming scheme.
  248.33 + *   = it seems that a few drivers would also appreciate
  248.34 + *    nybble swapping support...
  248.35 + *   = every architecture could add their byteswap macro in asm/byteorder.h
  248.36 + *    see how some architectures already do (i386, alpha, ppc, etc)
  248.37 + *   = cpu_to_beXX and beXX_to_cpu might some day need to be well
  248.38 + *    distinguished throughout the kernel. This is not the case currently,
  248.39 + *    since little endian, big endian, and pdp endian machines needn't it.
  248.40 + *    But this might be the case for, say, a port of Linux to 20/21 bit
  248.41 + *    architectures (and F21 Linux addict around?).
  248.42 + */
  248.43 +
  248.44 +/*
  248.45 + * The following macros are to be defined by <asm/byteorder.h>:
  248.46 + *
  248.47 + * Conversion of long and short int between network and host format
  248.48 + *	ntohl(__u32 x)
  248.49 + *	ntohs(__u16 x)
  248.50 + *	htonl(__u32 x)
  248.51 + *	htons(__u16 x)
  248.52 + * It seems that some programs (which? where? or perhaps a standard? POSIX?)
  248.53 + * might like the above to be functions, not macros (why?).
  248.54 + * if that's true, then detect them, and take measures.
  248.55 + * Anyway, the measure is: define only ___ntohl as a macro instead,
  248.56 + * and in a separate file, have
  248.57 + * unsigned long inline ntohl(x){return ___ntohl(x);}
  248.58 + *
  248.59 + * The same for constant arguments
  248.60 + *	__constant_ntohl(__u32 x)
  248.61 + *	__constant_ntohs(__u16 x)
  248.62 + *	__constant_htonl(__u32 x)
  248.63 + *	__constant_htons(__u16 x)
  248.64 + *
  248.65 + * Conversion of XX-bit integers (16- 32- or 64-)
  248.66 + * between native CPU format and little/big endian format
  248.67 + * 64-bit stuff only defined for proper architectures
  248.68 + *	cpu_to_[bl]eXX(__uXX x)
  248.69 + *	[bl]eXX_to_cpu(__uXX x)
  248.70 + *
  248.71 + * The same, but takes a pointer to the value to convert
  248.72 + *	cpu_to_[bl]eXXp(__uXX x)
  248.73 + *	[bl]eXX_to_cpup(__uXX x)
  248.74 + *
  248.75 + * The same, but change in situ
  248.76 + *	cpu_to_[bl]eXXs(__uXX x)
  248.77 + *	[bl]eXX_to_cpus(__uXX x)
  248.78 + *
  248.79 + * See asm-foo/byteorder.h for examples of how to provide
  248.80 + * architecture-optimized versions
  248.81 + *
  248.82 + */
  248.83 +
  248.84 +
  248.85 +#if defined(__KERNEL__)
  248.86 +/*
  248.87 + * inside the kernel, we can use nicknames;
  248.88 + * outside of it, we must avoid POSIX namespace pollution...
  248.89 + */
  248.90 +#define cpu_to_le64 __cpu_to_le64
  248.91 +#define le64_to_cpu __le64_to_cpu
  248.92 +#define cpu_to_le32 __cpu_to_le32
  248.93 +#define le32_to_cpu __le32_to_cpu
  248.94 +#define cpu_to_le16 __cpu_to_le16
  248.95 +#define le16_to_cpu __le16_to_cpu
  248.96 +#define cpu_to_be64 __cpu_to_be64
  248.97 +#define be64_to_cpu __be64_to_cpu
  248.98 +#define cpu_to_be32 __cpu_to_be32
  248.99 +#define be32_to_cpu __be32_to_cpu
 248.100 +#define cpu_to_be16 __cpu_to_be16
 248.101 +#define be16_to_cpu __be16_to_cpu
 248.102 +#define cpu_to_le64p __cpu_to_le64p
 248.103 +#define le64_to_cpup __le64_to_cpup
 248.104 +#define cpu_to_le32p __cpu_to_le32p
 248.105 +#define le32_to_cpup __le32_to_cpup
 248.106 +#define cpu_to_le16p __cpu_to_le16p
 248.107 +#define le16_to_cpup __le16_to_cpup
 248.108 +#define cpu_to_be64p __cpu_to_be64p
 248.109 +#define be64_to_cpup __be64_to_cpup
 248.110 +#define cpu_to_be32p __cpu_to_be32p
 248.111 +#define be32_to_cpup __be32_to_cpup
 248.112 +#define cpu_to_be16p __cpu_to_be16p
 248.113 +#define be16_to_cpup __be16_to_cpup
 248.114 +#define cpu_to_le64s __cpu_to_le64s
 248.115 +#define le64_to_cpus __le64_to_cpus
 248.116 +#define cpu_to_le32s __cpu_to_le32s
 248.117 +#define le32_to_cpus __le32_to_cpus
 248.118 +#define cpu_to_le16s __cpu_to_le16s
 248.119 +#define le16_to_cpus __le16_to_cpus
 248.120 +#define cpu_to_be64s __cpu_to_be64s
 248.121 +#define be64_to_cpus __be64_to_cpus
 248.122 +#define cpu_to_be32s __cpu_to_be32s
 248.123 +#define be32_to_cpus __be32_to_cpus
 248.124 +#define cpu_to_be16s __cpu_to_be16s
 248.125 +#define be16_to_cpus __be16_to_cpus
 248.126 +#endif
 248.127 +
 248.128 +
 248.129 +/*
 248.130 + * Handle ntohl and suches. These have various compatibility
 248.131 + * issues - like we want to give the prototype even though we
 248.132 + * also have a macro for them in case some strange program
 248.133 + * wants to take the address of the thing or something..
 248.134 + *
 248.135 + * Note that these used to return a "long" in libc5, even though
 248.136 + * long is often 64-bit these days.. Thus the casts.
 248.137 + *
 248.138 + * They have to be macros in order to do the constant folding
 248.139 + * correctly - if the argument passed into a inline function
 248.140 + * it is no longer constant according to gcc..
 248.141 + */
 248.142 +
 248.143 +#undef ntohl
 248.144 +#undef ntohs
 248.145 +#undef htonl
 248.146 +#undef htons
 248.147 +
 248.148 +/*
 248.149 + * Do the prototypes. Somebody might want to take the
 248.150 + * address or some such sick thing..
 248.151 + */
 248.152 +#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
 248.153 +extern __u32			ntohl(__u32);
 248.154 +extern __u32			htonl(__u32);
 248.155 +#else
 248.156 +extern unsigned long int	ntohl(unsigned long int);
 248.157 +extern unsigned long int	htonl(unsigned long int);
 248.158 +#endif
 248.159 +extern unsigned short int	ntohs(unsigned short int);
 248.160 +extern unsigned short int	htons(unsigned short int);
 248.161 +
 248.162 +
 248.163 +#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__)
 248.164 +
 248.165 +#define ___htonl(x) __cpu_to_be32(x)
 248.166 +#define ___htons(x) __cpu_to_be16(x)
 248.167 +#define ___ntohl(x) __be32_to_cpu(x)
 248.168 +#define ___ntohs(x) __be16_to_cpu(x)
 248.169 +
 248.170 +#if defined(__KERNEL__) || (defined (__GLIBC__) && __GLIBC__ >= 2)
 248.171 +#define htonl(x) ___htonl(x)
 248.172 +#define ntohl(x) ___ntohl(x)
 248.173 +#else
 248.174 +#define htonl(x) ((unsigned long)___htonl(x))
 248.175 +#define ntohl(x) ((unsigned long)___ntohl(x))
 248.176 +#endif
 248.177 +#define htons(x) ___htons(x)
 248.178 +#define ntohs(x) ___ntohs(x)
 248.179 +
 248.180 +#endif /* OPTIMIZE */
 248.181 +
 248.182 +
 248.183 +#endif /* _LINUX_BYTEORDER_GENERIC_H */
   249.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   249.2 +++ b/xen/include/xen/byteorder/little_endian.h	Tue Mar 23 09:48:06 2004 +0000
   249.3 @@ -0,0 +1,68 @@
   249.4 +#ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H
   249.5 +#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H
   249.6 +
   249.7 +#ifndef __LITTLE_ENDIAN
   249.8 +#define __LITTLE_ENDIAN 1234
   249.9 +#endif
  249.10 +#ifndef __LITTLE_ENDIAN_BITFIELD
  249.11 +#define __LITTLE_ENDIAN_BITFIELD
  249.12 +#endif
  249.13 +
  249.14 +#include <xen/byteorder/swab.h>
  249.15 +
  249.16 +#define __constant_htonl(x) ___constant_swab32((x))
  249.17 +#define __constant_ntohl(x) ___constant_swab32((x))
  249.18 +#define __constant_htons(x) ___constant_swab16((x))
  249.19 +#define __constant_ntohs(x) ___constant_swab16((x))
  249.20 +#define __constant_cpu_to_le64(x) ((__u64)(x))
  249.21 +#define __constant_le64_to_cpu(x) ((__u64)(x))
  249.22 +#define __constant_cpu_to_le32(x) ((__u32)(x))
  249.23 +#define __constant_le32_to_cpu(x) ((__u32)(x))
  249.24 +#define __constant_cpu_to_le16(x) ((__u16)(x))
  249.25 +#define __constant_le16_to_cpu(x) ((__u16)(x))
  249.26 +#define __constant_cpu_to_be64(x) ___constant_swab64((x))
  249.27 +#define __constant_be64_to_cpu(x) ___constant_swab64((x))
  249.28 +#define __constant_cpu_to_be32(x) ___constant_swab32((x))
  249.29 +#define __constant_be32_to_cpu(x) ___constant_swab32((x))
  249.30 +#define __constant_cpu_to_be16(x) ___constant_swab16((x))
  249.31 +#define __constant_be16_to_cpu(x) ___constant_swab16((x))
  249.32 +#define __cpu_to_le64(x) ((__u64)(x))
  249.33 +#define __le64_to_cpu(x) ((__u64)(x))
  249.34 +#define __cpu_to_le32(x) ((__u32)(x))
  249.35 +#define __le32_to_cpu(x) ((__u32)(x))
  249.36 +#define __cpu_to_le16(x) ((__u16)(x))
  249.37 +#define __le16_to_cpu(x) ((__u16)(x))
  249.38 +#define __cpu_to_be64(x) __swab64((x))
  249.39 +#define __be64_to_cpu(x) __swab64((x))
  249.40 +#define __cpu_to_be32(x) __swab32((x))
  249.41 +#define __be32_to_cpu(x) __swab32((x))
  249.42 +#define __cpu_to_be16(x) __swab16((x))
  249.43 +#define __be16_to_cpu(x) __swab16((x))
  249.44 +#define __cpu_to_le64p(x) (*(__u64*)(x))
  249.45 +#define __le64_to_cpup(x) (*(__u64*)(x))
  249.46 +#define __cpu_to_le32p(x) (*(__u32*)(x))
  249.47 +#define __le32_to_cpup(x) (*(__u32*)(x))
  249.48 +#define __cpu_to_le16p(x) (*(__u16*)(x))
  249.49 +#define __le16_to_cpup(x) (*(__u16*)(x))
  249.50 +#define __cpu_to_be64p(x) __swab64p((x))
  249.51 +#define __be64_to_cpup(x) __swab64p((x))
  249.52 +#define __cpu_to_be32p(x) __swab32p((x))
  249.53 +#define __be32_to_cpup(x) __swab32p((x))
  249.54 +#define __cpu_to_be16p(x) __swab16p((x))
  249.55 +#define __be16_to_cpup(x) __swab16p((x))
  249.56 +#define __cpu_to_le64s(x) do {} while (0)
  249.57 +#define __le64_to_cpus(x) do {} while (0)
  249.58 +#define __cpu_to_le32s(x) do {} while (0)
  249.59 +#define __le32_to_cpus(x) do {} while (0)
  249.60 +#define __cpu_to_le16s(x) do {} while (0)
  249.61 +#define __le16_to_cpus(x) do {} while (0)
  249.62 +#define __cpu_to_be64s(x) __swab64s((x))
  249.63 +#define __be64_to_cpus(x) __swab64s((x))
  249.64 +#define __cpu_to_be32s(x) __swab32s((x))
  249.65 +#define __be32_to_cpus(x) __swab32s((x))
  249.66 +#define __cpu_to_be16s(x) __swab16s((x))
  249.67 +#define __be16_to_cpus(x) __swab16s((x))
  249.68 +
  249.69 +#include <xen/byteorder/generic.h>
  249.70 +
  249.71 +#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */
   250.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   250.2 +++ b/xen/include/xen/byteorder/pdp_endian.h	Tue Mar 23 09:48:06 2004 +0000
   250.3 @@ -0,0 +1,88 @@
   250.4 +#ifndef _LINUX_BYTEORDER_PDP_ENDIAN_H
   250.5 +#define _LINUX_BYTEORDER_PDP_ENDIAN_H
   250.6 +
   250.7 +/*
   250.8 + * Could have been named NUXI-endian, but we use the same name as in glibc.
   250.9 + * hopefully only the PDP and its evolutions (old VAXen in compatibility mode)
  250.10 + * should ever use this braindead byteorder.
  250.11 + * This file *should* work, but has not been tested.
  250.12 + *
  250.13 + * little-endian is 1234; big-endian is 4321; nuxi/pdp-endian is 3412
  250.14 + *
  250.15 + * I thought vaxen were NUXI-endian, but was told they were correct-endian
  250.16 + * (little-endian), though indeed there existed NUXI-endian machines
  250.17 + * (DEC PDP-11 and old VAXen in compatibility mode).
  250.18 + * This makes this file a bit useless, but as a proof-of-concept.
  250.19 + *
  250.20 + * But what does a __u64 look like: is it 34127856 or 78563412 ???
  250.21 + * I don't dare imagine! Hence, no 64-bit byteorder support yet.
  250.22 + * Hopefully, there 64-bit pdp-endian support shouldn't ever be required.
  250.23 + *
  250.24 + */
  250.25 +
  250.26 +#ifndef __PDP_ENDIAN
  250.27 +#define __PDP_ENDIAN 3412
  250.28 +#endif
  250.29 +#ifndef __PDP_ENDIAN_BITFIELD
  250.30 +#define __PDP_ENDIAN_BITFIELD
  250.31 +#endif
  250.32 +
  250.33 +#include <xen/byteorder/swab.h>
  250.34 +#include <xen/byteorder/swabb.h>
  250.35 +
  250.36 +#define __constant_htonl(x) ___constant_swahb32((x))
  250.37 +#define __constant_ntohl(x) ___constant_swahb32((x))
  250.38 +#define __constant_htons(x) ___constant_swab16((x))
  250.39 +#define __constant_ntohs(x) ___constant_swab16((x))
  250.40 +#define __constant_cpu_to_le64(x) I DON'T KNOW
  250.41 +#define __constant_le64_to_cpu(x) I DON'T KNOW
  250.42 +#define __constant_cpu_to_le32(x) ___constant_swahw32((x))
  250.43 +#define __constant_le32_to_cpu(x) ___constant_swahw32((x))
  250.44 +#define __constant_cpu_to_le16(x) ((__u16)(x)
  250.45 +#define __constant_le16_to_cpu(x) ((__u16)(x)
  250.46 +#define __constant_cpu_to_be64(x) I DON'T KNOW
  250.47 +#define __constant_be64_to_cpu(x) I DON'T KNOW
  250.48 +#define __constant_cpu_to_be32(x) ___constant_swahb32((x))
  250.49 +#define __constant_be32_to_cpu(x) ___constant_swahb32((x))
  250.50 +#define __constant_cpu_to_be16(x) ___constant_swab16((x))
  250.51 +#define __constant_be16_to_cpu(x) ___constant_swab16((x))
  250.52 +#define __cpu_to_le64(x) I DON'T KNOW
  250.53 +#define __le64_to_cpu(x) I DON'T KNOW
  250.54 +#define __cpu_to_le32(x) ___swahw32((x))
  250.55 +#define __le32_to_cpu(x) ___swahw32((x))
  250.56 +#define __cpu_to_le16(x) ((__u16)(x)
  250.57 +#define __le16_to_cpu(x) ((__u16)(x)
  250.58 +#define __cpu_to_be64(x) I DON'T KNOW
  250.59 +#define __be64_to_cpu(x) I DON'T KNOW
  250.60 +#define __cpu_to_be32(x) __swahb32((x))
  250.61 +#define __be32_to_cpu(x) __swahb32((x))
  250.62 +#define __cpu_to_be16(x) __swab16((x))
  250.63 +#define __be16_to_cpu(x) __swab16((x))
  250.64 +#define __cpu_to_le64p(x) I DON'T KNOW
  250.65 +#define __le64_to_cpup(x) I DON'T KNOW
  250.66 +#define __cpu_to_le32p(x) ___swahw32p((x))
  250.67 +#define __le32_to_cpup(x) ___swahw32p((x))
  250.68 +#define __cpu_to_le16p(x) (*(__u16*)(x))
  250.69 +#define __le16_to_cpup(x) (*(__u16*)(x))
  250.70 +#define __cpu_to_be64p(x) I DON'T KNOW
  250.71 +#define __be64_to_cpup(x) I DON'T KNOW
  250.72 +#define __cpu_to_be32p(x) __swahb32p((x))
  250.73 +#define __be32_to_cpup(x) __swahb32p((x))
  250.74 +#define __cpu_to_be16p(x) __swab16p((x))
  250.75 +#define __be16_to_cpup(x) __swab16p((x))
  250.76 +#define __cpu_to_le64s(x) I DON'T KNOW
  250.77 +#define __le64_to_cpus(x) I DON'T KNOW
  250.78 +#define __cpu_to_le32s(x) ___swahw32s((x))
  250.79 +#define __le32_to_cpus(x) ___swahw32s((x))
  250.80 +#define __cpu_to_le16s(x) do {} while (0)
  250.81 +#define __le16_to_cpus(x) do {} while (0)
  250.82 +#define __cpu_to_be64s(x) I DON'T KNOW
  250.83 +#define __be64_to_cpus(x) I DON'T KNOW
  250.84 +#define __cpu_to_be32s(x) __swahb32s((x))
  250.85 +#define __be32_to_cpus(x) __swahb32s((x))
  250.86 +#define __cpu_to_be16s(x) __swab16s((x))
  250.87 +#define __be16_to_cpus(x) __swab16s((x))
  250.88 +
  250.89 +#include <xen/byteorder/generic.h>
  250.90 +
  250.91 +#endif /* _LINUX_BYTEORDER_PDP_ENDIAN_H */
   251.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   251.2 +++ b/xen/include/xen/byteorder/swab.h	Tue Mar 23 09:48:06 2004 +0000
   251.3 @@ -0,0 +1,190 @@
   251.4 +#ifndef _LINUX_BYTEORDER_SWAB_H
   251.5 +#define _LINUX_BYTEORDER_SWAB_H
   251.6 +
   251.7 +/*
   251.8 + * linux/byteorder/swab.h
   251.9 + * Byte-swapping, independently from CPU endianness
  251.10 + *	swabXX[ps]?(foo)
  251.11 + *
  251.12 + * Francois-Rene Rideau <fare@tunes.org> 19971205
  251.13 + *    separated swab functions from cpu_to_XX,
  251.14 + *    to clean up support for bizarre-endian architectures.
  251.15 + *
  251.16 + * See asm-i386/byteorder.h and suches for examples of how to provide
  251.17 + * architecture-dependent optimized versions
  251.18 + *
  251.19 + */
  251.20 +
  251.21 +/* casts are necessary for constants, because we never know how for sure
  251.22 + * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
  251.23 + */
  251.24 +#define ___swab16(x) \
  251.25 +({ \
  251.26 +	__u16 __x = (x); \
  251.27 +	((__u16)( \
  251.28 +		(((__u16)(__x) & (__u16)0x00ffU) << 8) | \
  251.29 +		(((__u16)(__x) & (__u16)0xff00U) >> 8) )); \
  251.30 +})
  251.31 +
  251.32 +#define ___swab32(x) \
  251.33 +({ \
  251.34 +	__u32 __x = (x); \
  251.35 +	((__u32)( \
  251.36 +		(((__u32)(__x) & (__u32)0x000000ffUL) << 24) | \
  251.37 +		(((__u32)(__x) & (__u32)0x0000ff00UL) <<  8) | \
  251.38 +		(((__u32)(__x) & (__u32)0x00ff0000UL) >>  8) | \
  251.39 +		(((__u32)(__x) & (__u32)0xff000000UL) >> 24) )); \
  251.40 +})
  251.41 +
  251.42 +#define ___swab64(x) \
  251.43 +({ \
  251.44 +	__u64 __x = (x); \
  251.45 +	((__u64)( \
  251.46 +		(__u64)(((__u64)(__x) & (__u64)0x00000000000000ffULL) << 56) | \
  251.47 +		(__u64)(((__u64)(__x) & (__u64)0x000000000000ff00ULL) << 40) | \
  251.48 +		(__u64)(((__u64)(__x) & (__u64)0x0000000000ff0000ULL) << 24) | \
  251.49 +		(__u64)(((__u64)(__x) & (__u64)0x00000000ff000000ULL) <<  8) | \
  251.50 +	        (__u64)(((__u64)(__x) & (__u64)0x000000ff00000000ULL) >>  8) | \
  251.51 +		(__u64)(((__u64)(__x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
  251.52 +		(__u64)(((__u64)(__x) & (__u64)0x00ff000000000000ULL) >> 40) | \
  251.53 +		(__u64)(((__u64)(__x) & (__u64)0xff00000000000000ULL) >> 56) )); \
  251.54 +})
  251.55 +
  251.56 +#define ___constant_swab16(x) \
  251.57 +	((__u16)( \
  251.58 +		(((__u16)(x) & (__u16)0x00ffU) << 8) | \
  251.59 +		(((__u16)(x) & (__u16)0xff00U) >> 8) ))
  251.60 +#define ___constant_swab32(x) \
  251.61 +	((__u32)( \
  251.62 +		(((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
  251.63 +		(((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
  251.64 +		(((__u32)(x) & (__u32)0x00ff0000UL) >>  8) | \
  251.65 +		(((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
  251.66 +#define ___constant_swab64(x) \
  251.67 +	((__u64)( \
  251.68 +		(__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
  251.69 +		(__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
  251.70 +		(__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
  251.71 +		(__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) | \
  251.72 +	        (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) | \
  251.73 +		(__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
  251.74 +		(__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
  251.75 +		(__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))
  251.76 +
  251.77 +/*
  251.78 + * provide defaults when no architecture-specific optimization is detected
  251.79 + */
  251.80 +#ifndef __arch__swab16
  251.81 +#  define __arch__swab16(x) ({ __u16 __tmp = (x) ; ___swab16(__tmp); })
  251.82 +#endif
  251.83 +#ifndef __arch__swab32
  251.84 +#  define __arch__swab32(x) ({ __u32 __tmp = (x) ; ___swab32(__tmp); })
  251.85 +#endif
  251.86 +#ifndef __arch__swab64
  251.87 +#  define __arch__swab64(x) ({ __u64 __tmp = (x) ; ___swab64(__tmp); })
  251.88 +#endif
  251.89 +
  251.90 +#ifndef __arch__swab16p
  251.91 +#  define __arch__swab16p(x) __arch__swab16(*(x))
  251.92 +#endif
  251.93 +#ifndef __arch__swab32p
  251.94 +#  define __arch__swab32p(x) __arch__swab32(*(x))
  251.95 +#endif
  251.96 +#ifndef __arch__swab64p
  251.97 +#  define __arch__swab64p(x) __arch__swab64(*(x))
  251.98 +#endif
  251.99 +
 251.100 +#ifndef __arch__swab16s
 251.101 +#  define __arch__swab16s(x) do { *(x) = __arch__swab16p((x)); } while (0)
 251.102 +#endif
 251.103 +#ifndef __arch__swab32s
 251.104 +#  define __arch__swab32s(x) do { *(x) = __arch__swab32p((x)); } while (0)
 251.105 +#endif
 251.106 +#ifndef __arch__swab64s
 251.107 +#  define __arch__swab64s(x) do { *(x) = __arch__swab64p((x)); } while (0)
 251.108 +#endif
 251.109 +
 251.110 +
 251.111 +/*
 251.112 + * Allow constant folding
 251.113 + */
 251.114 +#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__)
 251.115 +#  define __swab16(x) \
 251.116 +(__builtin_constant_p((__u16)(x)) ? \
 251.117 + ___swab16((x)) : \
 251.118 + __fswab16((x)))
 251.119 +#  define __swab32(x) \
 251.120 +(__builtin_constant_p((__u32)(x)) ? \
 251.121 + ___swab32((x)) : \
 251.122 + __fswab32((x)))
 251.123 +#  define __swab64(x) \
 251.124 +(__builtin_constant_p((__u64)(x)) ? \
 251.125 + ___swab64((x)) : \
 251.126 + __fswab64((x)))
 251.127 +#else
 251.128 +#  define __swab16(x) __fswab16(x)
 251.129 +#  define __swab32(x) __fswab32(x)
 251.130 +#  define __swab64(x) __fswab64(x)
 251.131 +#endif /* OPTIMIZE */
 251.132 +
 251.133 +
 251.134 +static __inline__ __const__ __u16 __fswab16(__u16 x)
 251.135 +{
 251.136 +	return __arch__swab16(x);
 251.137 +}
 251.138 +static __inline__ __u16 __swab16p(__u16 *x)
 251.139 +{
 251.140 +	return __arch__swab16p(x);
 251.141 +}
 251.142 +static __inline__ void __swab16s(__u16 *addr)
 251.143 +{
 251.144 +	__arch__swab16s(addr);
 251.145 +}
 251.146 +
 251.147 +static __inline__ __const__ __u32 __fswab32(__u32 x)
 251.148 +{
 251.149 +	return __arch__swab32(x);
 251.150 +}
 251.151 +static __inline__ __u32 __swab32p(__u32 *x)
 251.152 +{
 251.153 +	return __arch__swab32p(x);
 251.154 +}
 251.155 +static __inline__ void __swab32s(__u32 *addr)
 251.156 +{
 251.157 +	__arch__swab32s(addr);
 251.158 +}
 251.159 +
 251.160 +#ifdef __BYTEORDER_HAS_U64__
 251.161 +static __inline__ __const__ __u64 __fswab64(__u64 x)
 251.162 +{
 251.163 +#  ifdef __SWAB_64_THRU_32__
 251.164 +	__u32 h = x >> 32;
 251.165 +        __u32 l = x & ((1ULL<<32)-1);
 251.166 +        return (((__u64)__swab32(l)) << 32) | ((__u64)(__swab32(h)));
 251.167 +#  else
 251.168 +	return __arch__swab64(x);
 251.169 +#  endif
 251.170 +}
 251.171 +static __inline__ __u64 __swab64p(__u64 *x)
 251.172 +{
 251.173 +	return __arch__swab64p(x);
 251.174 +}
 251.175 +static __inline__ void __swab64s(__u64 *addr)
 251.176 +{
 251.177 +	__arch__swab64s(addr);
 251.178 +}
 251.179 +#endif /* __BYTEORDER_HAS_U64__ */
 251.180 +
 251.181 +#if defined(__KERNEL__)
 251.182 +#define swab16 __swab16
 251.183 +#define swab32 __swab32
 251.184 +#define swab64 __swab64
 251.185 +#define swab16p __swab16p
 251.186 +#define swab32p __swab32p
 251.187 +#define swab64p __swab64p
 251.188 +#define swab16s __swab16s
 251.189 +#define swab32s __swab32s
 251.190 +#define swab64s __swab64s
 251.191 +#endif
 251.192 +
 251.193 +#endif /* _LINUX_BYTEORDER_SWAB_H */
   252.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   252.2 +++ b/xen/include/xen/byteorder/swabb.h	Tue Mar 23 09:48:06 2004 +0000
   252.3 @@ -0,0 +1,137 @@
   252.4 +#ifndef _LINUX_BYTEORDER_SWABB_H
   252.5 +#define _LINUX_BYTEORDER_SWABB_H
   252.6 +
   252.7 +/*
   252.8 + * linux/byteorder/swabb.h
   252.9 + * SWAp Bytes Bizarrely
  252.10 + *	swaHHXX[ps]?(foo)
  252.11 + *
  252.12 + * Support for obNUXIous pdp-endian and other bizarre architectures.
  252.13 + * Will Linux ever run on such ancient beasts? if not, this file
  252.14 + * will be but a programming pearl. Still, it's a reminder that we
  252.15 + * shouldn't be making too many assumptions when trying to be portable.
  252.16 + *
  252.17 + */
  252.18 +
  252.19 +/*
  252.20 + * Meaning of the names I chose (vaxlinux people feel free to correct them):
  252.21 + * swahw32	swap 16-bit half-words in a 32-bit word
  252.22 + * swahb32	swap 8-bit halves of each 16-bit half-word in a 32-bit word
  252.23 + *
  252.24 + * No 64-bit support yet. I don't know NUXI conventions for long longs.
  252.25 + * I guarantee it will be a mess when it's there, though :->
  252.26 + * It will be even worse if there are conflicting 64-bit conventions.
  252.27 + * Hopefully, no one ever used 64-bit objects on NUXI machines.
  252.28 + *
  252.29 + */
  252.30 +
  252.31 +#define ___swahw32(x) \
  252.32 +({ \
  252.33 +	__u32 __x = (x); \
  252.34 +	((__u32)( \
  252.35 +		(((__u32)(__x) & (__u32)0x0000ffffUL) << 16) | \
  252.36 +		(((__u32)(__x) & (__u32)0xffff0000UL) >> 16) )); \
  252.37 +})
  252.38 +#define ___swahb32(x) \
  252.39 +({ \
  252.40 +	__u32 __x = (x); \
  252.41 +	((__u32)( \
  252.42 +		(((__u32)(__x) & (__u32)0x00ff00ffUL) << 8) | \
  252.43 +		(((__u32)(__x) & (__u32)0xff00ff00UL) >> 8) )); \
  252.44 +})
  252.45 +
  252.46 +#define ___constant_swahw32(x) \
  252.47 +	((__u32)( \
  252.48 +		(((__u32)(x) & (__u32)0x0000ffffUL) << 16) | \
  252.49 +		(((__u32)(x) & (__u32)0xffff0000UL) >> 16) ))
  252.50 +#define ___constant_swahb32(x) \
  252.51 +	((__u32)( \
  252.52 +		(((__u32)(x) & (__u32)0x00ff00ffUL) << 8) | \
  252.53 +		(((__u32)(x) & (__u32)0xff00ff00UL) >> 8) ))
  252.54 +
  252.55 +/*
  252.56 + * provide defaults when no architecture-specific optimization is detected
  252.57 + */
  252.58 +#ifndef __arch__swahw32
  252.59 +#  define __arch__swahw32(x) ___swahw32(x)
  252.60 +#endif
  252.61 +#ifndef __arch__swahb32
  252.62 +#  define __arch__swahb32(x) ___swahb32(x)
  252.63 +#endif
  252.64 +
  252.65 +#ifndef __arch__swahw32p
  252.66 +#  define __arch__swahw32p(x) __swahw32(*(x))
  252.67 +#endif
  252.68 +#ifndef __arch__swahb32p
  252.69 +#  define __arch__swahb32p(x) __swahb32(*(x))
  252.70 +#endif
  252.71 +
  252.72 +#ifndef __arch__swahw32s
  252.73 +#  define __arch__swahw32s(x) do { *(x) = __swahw32p((x)); } while (0)
  252.74 +#endif
  252.75 +#ifndef __arch__swahb32s
  252.76 +#  define __arch__swahb32s(x) do { *(x) = __swahb32p((x)); } while (0)
  252.77 +#endif
  252.78 +
  252.79 +
  252.80 +/*
  252.81 + * Allow constant folding
  252.82 + */
  252.83 +#if defined(__GNUC__) && (__GNUC__ >= 2) && defined(__OPTIMIZE__)
  252.84 +#  define __swahw32(x) \
  252.85 +(__builtin_constant_p((__u32)(x)) ? \
  252.86 + ___swahw32((x)) : \
  252.87 + __fswahw32((x)))
  252.88 +#  define __swahb32(x) \
  252.89 +(__builtin_constant_p((__u32)(x)) ? \
  252.90 + ___swahb32((x)) : \
  252.91 + __fswahb32((x)))
  252.92 +#else
  252.93 +#  define __swahw32(x) __fswahw32(x)
  252.94 +#  define __swahb32(x) __fswahb32(x)
  252.95 +#endif /* OPTIMIZE */
  252.96 +
  252.97 +
  252.98 +static __inline__ __const__ __u32 __fswahw32(__u32 x)
  252.99 +{
 252.100 +	return __arch__swahw32(x);
 252.101 +}
 252.102 +static __inline__ __u32 __swahw32p(__u32 *x)
 252.103 +{
 252.104 +	return __arch__swahw32p(x);
 252.105 +}
 252.106 +static __inline__ void __swahw32s(__u32 *addr)
 252.107 +{
 252.108 +	__arch__swahw32s(addr);
 252.109 +}
 252.110 +
 252.111 +
 252.112 +static __inline__ __const__ __u32 __fswahb32(__u32 x)
 252.113 +{
 252.114 +	return __arch__swahb32(x);
 252.115 +}
 252.116 +static __inline__ __u32 __swahb32p(__u32 *x)
 252.117 +{
 252.118 +	return __arch__swahb32p(x);
 252.119 +}
 252.120 +static __inline__ void __swahb32s(__u32 *addr)
 252.121 +{
 252.122 +	__arch__swahb32s(addr);
 252.123 +}
 252.124 +
 252.125 +#ifdef __BYTEORDER_HAS_U64__
 252.126 +/*
 252.127 + * Not supported yet
 252.128 + */
 252.129 +#endif /* __BYTEORDER_HAS_U64__ */
 252.130 +
 252.131 +#if defined(__KERNEL__)
 252.132 +#define swahw32 __swahw32
 252.133 +#define swahb32 __swahb32
 252.134 +#define swahw32p __swahw32p
 252.135 +#define swahb32p __swahb32p
 252.136 +#define swahw32s __swahw32s
 252.137 +#define swahb32s __swahb32s
 252.138 +#endif
 252.139 +
 252.140 +#endif /* _LINUX_BYTEORDER_SWABB_H */
   253.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   253.2 +++ b/xen/include/xen/cache.h	Tue Mar 23 09:48:06 2004 +0000
   253.3 @@ -0,0 +1,37 @@
   253.4 +#ifndef __LINUX_CACHE_H
   253.5 +#define __LINUX_CACHE_H
   253.6 +
   253.7 +#include <xen/config.h>
   253.8 +#include <asm/cache.h>
   253.9 +
  253.10 +#ifndef L1_CACHE_ALIGN
  253.11 +#define L1_CACHE_ALIGN(x) (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
  253.12 +#endif
  253.13 +
  253.14 +#ifndef SMP_CACHE_BYTES
  253.15 +#define SMP_CACHE_BYTES L1_CACHE_BYTES
  253.16 +#endif
  253.17 +
  253.18 +#ifndef ____cacheline_aligned
  253.19 +#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  253.20 +#endif
  253.21 +
  253.22 +#ifndef ____cacheline_aligned_in_smp
  253.23 +#ifdef CONFIG_SMP
  253.24 +#define ____cacheline_aligned_in_smp ____cacheline_aligned
  253.25 +#else
  253.26 +#define ____cacheline_aligned_in_smp
  253.27 +#endif /* CONFIG_SMP */
  253.28 +#endif
  253.29 +
  253.30 +#ifndef __cacheline_aligned
  253.31 +#ifdef MODULE
  253.32 +#define __cacheline_aligned ____cacheline_aligned
  253.33 +#else
  253.34 +#define __cacheline_aligned					\
  253.35 +  __attribute__((__aligned__(SMP_CACHE_BYTES),			\
  253.36 +		 __section__(".data.cacheline_aligned")))
  253.37 +#endif
  253.38 +#endif /* __cacheline_aligned */
  253.39 +
  253.40 +#endif /* __LINUX_CACHE_H */
   254.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   254.2 +++ b/xen/include/xen/cdrom.h	Tue Mar 23 09:48:06 2004 +0000
   254.3 @@ -0,0 +1,1067 @@
   254.4 +/*
   254.5 + * -- <xen/cdrom.h>
   254.6 + * General header file for linux CD-ROM drivers 
   254.7 + * Copyright (C) 1992         David Giller, rafetmad@oxy.edu
   254.8 + *               1994, 1995   Eberhard Moenkeberg, emoenke@gwdg.de
   254.9 + *               1996         David van Leeuwen, david@tm.tno.nl
  254.10 + *               1997, 1998   Erik Andersen, andersee@debian.org
  254.11 + *               1998-2000    Jens Axboe, axboe@suse.de
  254.12 + */
  254.13 + 
  254.14 +#ifndef	_LINUX_CDROM_H
  254.15 +#define	_LINUX_CDROM_H
  254.16 +
  254.17 +#include <asm/byteorder.h>
  254.18 +
  254.19 +/*******************************************************
  254.20 + * As of Linux 2.1.x, all Linux CD-ROM application programs will use this 
  254.21 + * (and only this) include file.  It is my hope to provide Linux with
  254.22 + * a uniform interface between software accessing CD-ROMs and the various 
  254.23 + * device drivers that actually talk to the drives.  There may still be
  254.24 + * 23 different kinds of strange CD-ROM drives, but at least there will 
  254.25 + * now be one, and only one, Linux CD-ROM interface.
  254.26 + *
  254.27 + * Additionally, as of Linux 2.1.x, all Linux application programs 
  254.28 + * should use the O_NONBLOCK option when opening a CD-ROM device 
  254.29 + * for subsequent ioctl commands.  This allows for neat system errors 
  254.30 + * like "No medium found" or "Wrong medium type" upon attempting to 
  254.31 + * mount or play an empty slot, mount an audio disc, or play a data disc.
  254.32 + * Generally, changing an application program to support O_NONBLOCK
  254.33 + * is as easy as the following:
  254.34 + *       -    drive = open("/dev/cdrom", O_RDONLY);
  254.35 + *       +    drive = open("/dev/cdrom", O_RDONLY | O_NONBLOCK);
  254.36 + * It is worth the small change.
  254.37 + *
  254.38 + *  Patches for many common CD programs (provided by David A. van Leeuwen)
  254.39 + *  can be found at:  ftp://ftp.gwdg.de/pub/linux/cdrom/drivers/cm206/
  254.40 + * 
  254.41 + *******************************************************/
  254.42 +
  254.43 +/* When a driver supports a certain function, but the cdrom drive we are 
  254.44 + * using doesn't, we will return the error EDRIVE_CANT_DO_THIS.  We will 
  254.45 + * borrow the "Operation not supported" error from the network folks to 
  254.46 + * accomplish this.  Maybe someday we will get a more targeted error code, 
  254.47 + * but this will do for now... */
  254.48 +#define EDRIVE_CANT_DO_THIS  EOPNOTSUPP
  254.49 +
  254.50 +/*******************************************************
  254.51 + * The CD-ROM IOCTL commands  -- these should be supported by 
  254.52 + * all the various cdrom drivers.  For the CD-ROM ioctls, we 
  254.53 + * will commandeer byte 0x53, or 'S'.
  254.54 + *******************************************************/
  254.55 +#define CDROMPAUSE		0x5301 /* Pause Audio Operation */ 
  254.56 +#define CDROMRESUME		0x5302 /* Resume paused Audio Operation */
  254.57 +#define CDROMPLAYMSF		0x5303 /* Play Audio MSF (struct cdrom_msf) */
  254.58 +#define CDROMPLAYTRKIND		0x5304 /* Play Audio Track/index 
  254.59 +                                           (struct cdrom_ti) */
  254.60 +#define CDROMREADTOCHDR		0x5305 /* Read TOC header 
  254.61 +                                           (struct cdrom_tochdr) */
  254.62 +#define CDROMREADTOCENTRY	0x5306 /* Read TOC entry 
  254.63 +                                           (struct cdrom_tocentry) */
  254.64 +#define CDROMSTOP		0x5307 /* Stop the cdrom drive */
  254.65 +#define CDROMSTART		0x5308 /* Start the cdrom drive */
  254.66 +#define CDROMEJECT		0x5309 /* Ejects the cdrom media */
  254.67 +#define CDROMVOLCTRL		0x530a /* Control output volume 
  254.68 +                                           (struct cdrom_volctrl) */
  254.69 +#define CDROMSUBCHNL		0x530b /* Read subchannel data 
  254.70 +                                           (struct cdrom_subchnl) */
  254.71 +#define CDROMREADMODE2		0x530c /* Read CDROM mode 2 data (2336 Bytes) 
  254.72 +                                           (struct cdrom_read) */
  254.73 +#define CDROMREADMODE1		0x530d /* Read CDROM mode 1 data (2048 Bytes)
  254.74 +                                           (struct cdrom_read) */
  254.75 +#define CDROMREADAUDIO		0x530e /* (struct cdrom_read_audio) */
  254.76 +#define CDROMEJECT_SW		0x530f /* enable(1)/disable(0) auto-ejecting */
  254.77 +#define CDROMMULTISESSION	0x5310 /* Obtain the start-of-last-session 
  254.78 +                                           address of multi session disks 
  254.79 +                                           (struct cdrom_multisession) */
  254.80 +#define CDROM_GET_MCN		0x5311 /* Obtain the "Universal Product Code" 
  254.81 +                                           if available (struct cdrom_mcn) */
  254.82 +#define CDROM_GET_UPC		CDROM_GET_MCN  /* This one is depricated, 
  254.83 +                                          but here anyway for compatability */
  254.84 +#define CDROMRESET		0x5312 /* hard-reset the drive */
  254.85 +#define CDROMVOLREAD		0x5313 /* Get the drive's volume setting 
  254.86 +                                          (struct cdrom_volctrl) */
  254.87 +#define CDROMREADRAW		0x5314	/* read data in raw mode (2352 Bytes)
  254.88 +                                           (struct cdrom_read) */
  254.89 +/* 
  254.90 + * These ioctls are used only used in aztcd.c and optcd.c
  254.91 + */
  254.92 +#define CDROMREADCOOKED		0x5315	/* read data in cooked mode */
  254.93 +#define CDROMSEEK		0x5316  /* seek msf address */
  254.94 +  
  254.95 +/*
  254.96 + * This ioctl is only used by the scsi-cd driver.  
  254.97 +   It is for playing audio in logical block addressing mode.
  254.98 + */
  254.99 +#define CDROMPLAYBLK		0x5317	/* (struct cdrom_blk) */
 254.100 +
 254.101 +/* 
 254.102 + * These ioctls are only used in optcd.c
 254.103 + */
 254.104 +#define CDROMREADALL		0x5318	/* read all 2646 bytes */
 254.105 +
 254.106 +/* 
 254.107 + * These ioctls are (now) only in ide-cd.c for controlling 
 254.108 + * drive spindown time.  They should be implemented in the
 254.109 + * Uniform driver, via generic packet commands, GPCMD_MODE_SELECT_10,
 254.110 + * GPCMD_MODE_SENSE_10 and the GPMODE_POWER_PAGE...
 254.111 + *  -Erik
 254.112 + */
 254.113 +#define CDROMGETSPINDOWN        0x531d
 254.114 +#define CDROMSETSPINDOWN        0x531e
 254.115 +
 254.116 +/* 
 254.117 + * These ioctls are implemented through the uniform CD-ROM driver
 254.118 + * They _will_ be adopted by all CD-ROM drivers, when all the CD-ROM
 254.119 + * drivers are eventually ported to the uniform CD-ROM driver interface.
 254.120 + */
 254.121 +#define CDROMCLOSETRAY		0x5319	/* pendant of CDROMEJECT */
 254.122 +#define CDROM_SET_OPTIONS	0x5320  /* Set behavior options */
 254.123 +#define CDROM_CLEAR_OPTIONS	0x5321  /* Clear behavior options */
 254.124 +#define CDROM_SELECT_SPEED	0x5322  /* Set the CD-ROM speed */
 254.125 +#define CDROM_SELECT_DISC	0x5323  /* Select disc (for juke-boxes) */
 254.126 +#define CDROM_MEDIA_CHANGED	0x5325  /* Check is media changed  */
 254.127 +#define CDROM_DRIVE_STATUS	0x5326  /* Get tray position, etc. */
 254.128 +#define CDROM_DISC_STATUS	0x5327  /* Get disc type, etc. */
 254.129 +#define CDROM_CHANGER_NSLOTS    0x5328  /* Get number of slots */
 254.130 +#define CDROM_LOCKDOOR		0x5329  /* lock or unlock door */
 254.131 +#define CDROM_DEBUG		0x5330	/* Turn debug messages on/off */
 254.132 +#define CDROM_GET_CAPABILITY	0x5331	/* get capabilities */
 254.133 +
 254.134 +/* Note that scsi/scsi_ioctl.h also uses 0x5382 - 0x5386.
 254.135 + * Future CDROM ioctls should be kept below 0x537F
 254.136 + */
 254.137 +
 254.138 +/* This ioctl is only used by sbpcd at the moment */
 254.139 +#define CDROMAUDIOBUFSIZ        0x5382	/* set the audio buffer size */
 254.140 +					/* conflict with SCSI_IOCTL_GET_IDLUN */
 254.141 +
 254.142 +/* DVD-ROM Specific ioctls */
 254.143 +#define DVD_READ_STRUCT		0x5390  /* Read structure */
 254.144 +#define DVD_WRITE_STRUCT	0x5391  /* Write structure */
 254.145 +#define DVD_AUTH		0x5392  /* Authentication */
 254.146 +
 254.147 +#define CDROM_SEND_PACKET	0x5393	/* send a packet to the drive */
 254.148 +#define CDROM_NEXT_WRITABLE	0x5394	/* get next writable block */
 254.149 +#define CDROM_LAST_WRITTEN	0x5395	/* get last block written on disc */
 254.150 +
 254.151 +/*******************************************************
 254.152 + * CDROM IOCTL structures
 254.153 + *******************************************************/
 254.154 +
 254.155 +/* Address in MSF format */
 254.156 +struct cdrom_msf0		
 254.157 +{
 254.158 +	__u8	minute;
 254.159 +	__u8	second;
 254.160 +	__u8	frame;
 254.161 +};
 254.162 +
 254.163 +/* Address in either MSF or logical format */
 254.164 +union cdrom_addr		
 254.165 +{
 254.166 +	struct cdrom_msf0	msf;
 254.167 +	int			lba;
 254.168 +};
 254.169 +
 254.170 +/* This struct is used by the CDROMPLAYMSF ioctl */ 
 254.171 +struct cdrom_msf 
 254.172 +{
 254.173 +	__u8	cdmsf_min0;	/* start minute */
 254.174 +	__u8	cdmsf_sec0;	/* start second */
 254.175 +	__u8	cdmsf_frame0;	/* start frame */
 254.176 +	__u8	cdmsf_min1;	/* end minute */
 254.177 +	__u8	cdmsf_sec1;	/* end second */
 254.178 +	__u8	cdmsf_frame1;	/* end frame */
 254.179 +};
 254.180 +
 254.181 +/* This struct is used by the CDROMPLAYTRKIND ioctl */
 254.182 +struct cdrom_ti 
 254.183 +{
 254.184 +	__u8	cdti_trk0;	/* start track */
 254.185 +	__u8	cdti_ind0;	/* start index */
 254.186 +	__u8	cdti_trk1;	/* end track */
 254.187 +	__u8	cdti_ind1;	/* end index */
 254.188 +};
 254.189 +
 254.190 +/* This struct is used by the CDROMREADTOCHDR ioctl */
 254.191 +struct cdrom_tochdr 	
 254.192 +{
 254.193 +	__u8	cdth_trk0;	/* start track */
 254.194 +	__u8	cdth_trk1;	/* end track */
 254.195 +};
 254.196 +
 254.197 +/* This struct is used by the CDROMVOLCTRL and CDROMVOLREAD ioctls */
 254.198 +struct cdrom_volctrl
 254.199 +{
 254.200 +	__u8	channel0;
 254.201 +	__u8	channel1;
 254.202 +	__u8	channel2;
 254.203 +	__u8	channel3;
 254.204 +};
 254.205 +
 254.206 +/* This struct is used by the CDROMSUBCHNL ioctl */
 254.207 +struct cdrom_subchnl 
 254.208 +{
 254.209 +	__u8	cdsc_format;
 254.210 +	__u8	cdsc_audiostatus;
 254.211 +	__u8	cdsc_adr:	4;
 254.212 +	__u8	cdsc_ctrl:	4;
 254.213 +	__u8	cdsc_trk;
 254.214 +	__u8	cdsc_ind;
 254.215 +	union cdrom_addr cdsc_absaddr;
 254.216 +	union cdrom_addr cdsc_reladdr;
 254.217 +};
 254.218 +
 254.219 +
 254.220 +/* This struct is used by the CDROMREADTOCENTRY ioctl */
 254.221 +struct cdrom_tocentry 
 254.222 +{
 254.223 +	__u8	cdte_track;
 254.224 +	__u8	cdte_adr	:4;
 254.225 +	__u8	cdte_ctrl	:4;
 254.226 +	__u8	cdte_format;
 254.227 +	union cdrom_addr cdte_addr;
 254.228 +	__u8	cdte_datamode;
 254.229 +};
 254.230 +
 254.231 +/* This struct is used by the CDROMREADMODE1, and CDROMREADMODE2 ioctls */
 254.232 +struct cdrom_read      
 254.233 +{
 254.234 +	int	cdread_lba;
 254.235 +	char 	*cdread_bufaddr;
 254.236 +	int	cdread_buflen;
 254.237 +};
 254.238 +
 254.239 +/* This struct is used by the CDROMREADAUDIO ioctl */
 254.240 +struct cdrom_read_audio
 254.241 +{
 254.242 +	union cdrom_addr addr; /* frame address */
 254.243 +	__u8 addr_format;    /* CDROM_LBA or CDROM_MSF */
 254.244 +	int nframes;           /* number of 2352-byte-frames to read at once */
 254.245 +	__u8 *buf;           /* frame buffer (size: nframes*2352 bytes) */
 254.246 +};
 254.247 +
 254.248 +/* This struct is used with the CDROMMULTISESSION ioctl */
 254.249 +struct cdrom_multisession
 254.250 +{
 254.251 +	union cdrom_addr addr; /* frame address: start-of-last-session 
 254.252 +	                           (not the new "frame 16"!).  Only valid
 254.253 +	                           if the "xa_flag" is true. */
 254.254 +	__u8 xa_flag;        /* 1: "is XA disk" */
 254.255 +	__u8 addr_format;    /* CDROM_LBA or CDROM_MSF */
 254.256 +};
 254.257 +
 254.258 +/* This struct is used with the CDROM_GET_MCN ioctl.  
 254.259 + * Very few audio discs actually have Universal Product Code information, 
 254.260 + * which should just be the Medium Catalog Number on the box.  Also note 
 254.261 + * that the way the codeis written on CD is _not_ uniform across all discs!
 254.262 + */  
 254.263 +struct cdrom_mcn 
 254.264 +{
 254.265 +  __u8 medium_catalog_number[14]; /* 13 ASCII digits, null-terminated */
 254.266 +};
 254.267 +
 254.268 +/* This is used by the CDROMPLAYBLK ioctl */
 254.269 +struct cdrom_blk 
 254.270 +{
 254.271 +	unsigned from;
 254.272 +	unsigned short len;
 254.273 +};
 254.274 +
 254.275 +#define CDROM_PACKET_SIZE	12
 254.276 +
 254.277 +#define CGC_DATA_UNKNOWN	0
 254.278 +#define CGC_DATA_WRITE		1
 254.279 +#define CGC_DATA_READ		2
 254.280 +#define CGC_DATA_NONE		3
 254.281 +
 254.282 +/* for CDROM_PACKET_COMMAND ioctl */
 254.283 +struct cdrom_generic_command
 254.284 +{
 254.285 +	unsigned char 		cmd[CDROM_PACKET_SIZE];
 254.286 +	unsigned char 		*buffer;
 254.287 +	unsigned int 		buflen;
 254.288 +	int			stat;
 254.289 +	struct request_sense	*sense;
 254.290 +	unsigned char		data_direction;
 254.291 +	int			quiet;
 254.292 +	int			timeout;
 254.293 +	void			*reserved[1];
 254.294 +};
 254.295 +
 254.296 +
 254.297 +/*
 254.298 + * A CD-ROM physical sector size is 2048, 2052, 2056, 2324, 2332, 2336, 
 254.299 + * 2340, or 2352 bytes long.  
 254.300 +
 254.301 +*         Sector types of the standard CD-ROM data formats:
 254.302 + *
 254.303 + * format   sector type               user data size (bytes)
 254.304 + * -----------------------------------------------------------------------------
 254.305 + *   1     (Red Book)    CD-DA          2352    (CD_FRAMESIZE_RAW)
 254.306 + *   2     (Yellow Book) Mode1 Form1    2048    (CD_FRAMESIZE)
 254.307 + *   3     (Yellow Book) Mode1 Form2    2336    (CD_FRAMESIZE_RAW0)
 254.308 + *   4     (Green Book)  Mode2 Form1    2048    (CD_FRAMESIZE)
 254.309 + *   5     (Green Book)  Mode2 Form2    2328    (2324+4 spare bytes)
 254.310 + *
 254.311 + *
 254.312 + *       The layout of the standard CD-ROM data formats:
 254.313 + * -----------------------------------------------------------------------------
 254.314 + * - audio (red):                  | audio_sample_bytes |
 254.315 + *                                 |        2352        |
 254.316 + *
 254.317 + * - data (yellow, mode1):         | sync - head - data - EDC - zero - ECC |
 254.318 + *                                 |  12  -   4  - 2048 -  4  -   8  - 276 |
 254.319 + *
 254.320 + * - data (yellow, mode2):         | sync - head - data |
 254.321 + *                                 |  12  -   4  - 2336 |
 254.322 + *
 254.323 + * - XA data (green, mode2 form1): | sync - head - sub - data - EDC - ECC |
 254.324 + *                                 |  12  -   4  -  8  - 2048 -  4  - 276 |
 254.325 + *
 254.326 + * - XA data (green, mode2 form2): | sync - head - sub - data - Spare |
 254.327 + *                                 |  12  -   4  -  8  - 2324 -  4    |
 254.328 + *
 254.329 + */
 254.330 +
 254.331 +/* Some generally useful CD-ROM information -- mostly based on the above */
 254.332 +#define CD_MINS              74 /* max. minutes per CD, not really a limit */
 254.333 +#define CD_SECS              60 /* seconds per minute */
 254.334 +#define CD_FRAMES            75 /* frames per second */
 254.335 +#define CD_SYNC_SIZE         12 /* 12 sync bytes per raw data frame */
 254.336 +#define CD_MSF_OFFSET       150 /* MSF numbering offset of first frame */
 254.337 +#define CD_CHUNK_SIZE        24 /* lowest-level "data bytes piece" */
 254.338 +#define CD_NUM_OF_CHUNKS     98 /* chunks per frame */
 254.339 +#define CD_FRAMESIZE_SUB     96 /* subchannel data "frame" size */
 254.340 +#define CD_HEAD_SIZE          4 /* header (address) bytes per raw data frame */
 254.341 +#define CD_SUBHEAD_SIZE       8 /* subheader bytes per raw XA data frame */
 254.342 +#define CD_EDC_SIZE           4 /* bytes EDC per most raw data frame types */
 254.343 +#define CD_ZERO_SIZE          8 /* bytes zero per yellow book mode 1 frame */
 254.344 +#define CD_ECC_SIZE         276 /* bytes ECC per most raw data frame types */
 254.345 +#define CD_FRAMESIZE       2048 /* bytes per frame, "cooked" mode */
 254.346 +#define CD_FRAMESIZE_RAW   2352 /* bytes per frame, "raw" mode */
 254.347 +#define CD_FRAMESIZE_RAWER 2646 /* The maximum possible returned bytes */ 
 254.348 +/* most drives don't deliver everything: */
 254.349 +#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /*2340*/
 254.350 +#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /*2336*/
 254.351 +
 254.352 +#define CD_XA_HEAD        (CD_HEAD_SIZE+CD_SUBHEAD_SIZE) /* "before data" part of raw XA frame */
 254.353 +#define CD_XA_TAIL        (CD_EDC_SIZE+CD_ECC_SIZE) /* "after data" part of raw XA frame */
 254.354 +#define CD_XA_SYNC_HEAD   (CD_SYNC_SIZE+CD_XA_HEAD) /* sync bytes + header of XA frame */
 254.355 +
 254.356 +/* CD-ROM address types (cdrom_tocentry.cdte_format) */
 254.357 +#define	CDROM_LBA 0x01 /* "logical block": first frame is #0 */
 254.358 +#define	CDROM_MSF 0x02 /* "minute-second-frame": binary, not bcd here! */
 254.359 +
 254.360 +/* bit to tell whether track is data or audio (cdrom_tocentry.cdte_ctrl) */
 254.361 +#define	CDROM_DATA_TRACK	0x04
 254.362 +
 254.363 +/* The leadout track is always 0xAA, regardless of # of tracks on disc */
 254.364 +#define	CDROM_LEADOUT		0xAA
 254.365 +
 254.366 +/* audio states (from SCSI-2, but seen with other drives, too) */
 254.367 +#define	CDROM_AUDIO_INVALID	0x00	/* audio status not supported */
 254.368 +#define	CDROM_AUDIO_PLAY	0x11	/* audio play operation in progress */
 254.369 +#define	CDROM_AUDIO_PAUSED	0x12	/* audio play operation paused */
 254.370 +#define	CDROM_AUDIO_COMPLETED	0x13	/* audio play successfully completed */
 254.371 +#define	CDROM_AUDIO_ERROR	0x14	/* audio play stopped due to error */
 254.372 +#define	CDROM_AUDIO_NO_STATUS	0x15	/* no current audio status to return */
 254.373 +
 254.374 +/* capability flags used with the uniform CD-ROM driver */ 
 254.375 +#define CDC_CLOSE_TRAY		0x1     /* caddy systems _can't_ close */
 254.376 +#define CDC_OPEN_TRAY		0x2     /* but _can_ eject.  */
 254.377 +#define CDC_LOCK		0x4     /* disable manual eject */
 254.378 +#define CDC_SELECT_SPEED 	0x8     /* programmable speed */
 254.379 +#define CDC_SELECT_DISC		0x10    /* select disc from juke-box */
 254.380 +#define CDC_MULTI_SESSION 	0x20    /* read sessions>1 */
 254.381 +#define CDC_MCN			0x40    /* Medium Catalog Number */
 254.382 +#define CDC_MEDIA_CHANGED 	0x80    /* media changed */
 254.383 +#define CDC_PLAY_AUDIO		0x100   /* audio functions */
 254.384 +#define CDC_RESET               0x200   /* hard reset device */
 254.385 +#define CDC_IOCTLS              0x400   /* driver has non-standard ioctls */
 254.386 +#define CDC_DRIVE_STATUS        0x800   /* driver implements drive status */
 254.387 +#define CDC_GENERIC_PACKET	0x1000	/* driver implements generic packets */
 254.388 +#define CDC_CD_R		0x2000	/* drive is a CD-R */
 254.389 +#define CDC_CD_RW		0x4000	/* drive is a CD-RW */
 254.390 +#define CDC_DVD			0x8000	/* drive is a DVD */
 254.391 +#define CDC_DVD_R		0x10000	/* drive can write DVD-R */
 254.392 +#define CDC_DVD_RAM		0x20000	/* drive can write DVD-RAM */
 254.393 +
 254.394 +/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
 254.395 +#define CDS_NO_INFO		0	/* if not implemented */
 254.396 +#define CDS_NO_DISC		1
 254.397 +#define CDS_TRAY_OPEN		2
 254.398 +#define CDS_DRIVE_NOT_READY	3
 254.399 +#define CDS_DISC_OK		4
 254.400 +
 254.401 +/* return values for the CDROM_DISC_STATUS ioctl */
 254.402 +/* can also return CDS_NO_[INFO|DISC], from above */
 254.403 +#define CDS_AUDIO		100
 254.404 +#define CDS_DATA_1		101
 254.405 +#define CDS_DATA_2		102
 254.406 +#define CDS_XA_2_1		103
 254.407 +#define CDS_XA_2_2		104
 254.408 +#define CDS_MIXED		105
 254.409 +
 254.410 +/* User-configurable behavior options for the uniform CD-ROM driver */
 254.411 +#define CDO_AUTO_CLOSE		0x1     /* close tray on first open() */
 254.412 +#define CDO_AUTO_EJECT		0x2     /* open tray on last release() */
 254.413 +#define CDO_USE_FFLAGS		0x4     /* use O_NONBLOCK information on open */
 254.414 +#define CDO_LOCK		0x8     /* lock tray on open files */
 254.415 +#define CDO_CHECK_TYPE		0x10    /* check type on open for data */
 254.416 +
 254.417 +/* Special codes used when specifying changer slots. */
 254.418 +#define CDSL_NONE       	((int) (~0U>>1)-1)
 254.419 +#define CDSL_CURRENT    	((int) (~0U>>1))
 254.420 +
 254.421 +/* For partition based multisession access. IDE can handle 64 partitions
 254.422 + * per drive - SCSI CD-ROM's use minors to differentiate between the
 254.423 + * various drives, so we can't do multisessions the same way there.
 254.424 + * Use the -o session=x option to mount on them.
 254.425 + */
 254.426 +#define CD_PART_MAX		64
 254.427 +#define CD_PART_MASK		(CD_PART_MAX - 1)
 254.428 +
 254.429 +/*********************************************************************
 254.430 + * Generic Packet commands, MMC commands, and such
 254.431 + *********************************************************************/
 254.432 +
 254.433 + /* The generic packet command opcodes for CD/DVD Logical Units,
 254.434 + * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
 254.435 +#define GPCMD_BLANK			    0xa1
 254.436 +#define GPCMD_CLOSE_TRACK		    0x5b
 254.437 +#define GPCMD_FLUSH_CACHE		    0x35
 254.438 +#define GPCMD_FORMAT_UNIT		    0x04
 254.439 +#define GPCMD_GET_CONFIGURATION		    0x46
 254.440 +#define GPCMD_GET_EVENT_STATUS_NOTIFICATION 0x4a
 254.441 +#define GPCMD_GET_PERFORMANCE		    0xac
 254.442 +#define GPCMD_INQUIRY			    0x12
 254.443 +#define GPCMD_LOAD_UNLOAD		    0xa6
 254.444 +#define GPCMD_MECHANISM_STATUS		    0xbd
 254.445 +#define GPCMD_MODE_SELECT_10		    0x55
 254.446 +#define GPCMD_MODE_SENSE_10		    0x5a
 254.447 +#define GPCMD_PAUSE_RESUME		    0x4b
 254.448 +#define GPCMD_PLAY_AUDIO_10		    0x45
 254.449 +#define GPCMD_PLAY_AUDIO_MSF		    0x47
 254.450 +#define GPCMD_PLAY_AUDIO_TI		    0x48
 254.451 +#define GPCMD_PLAY_CD			    0xbc
 254.452 +#define GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL  0x1e
 254.453 +#define GPCMD_READ_10			    0x28
 254.454 +#define GPCMD_READ_12			    0xa8
 254.455 +#define GPCMD_READ_CDVD_CAPACITY	    0x25
 254.456 +#define GPCMD_READ_CD			    0xbe
 254.457 +#define GPCMD_READ_CD_MSF		    0xb9
 254.458 +#define GPCMD_READ_DISC_INFO		    0x51
 254.459 +#define GPCMD_READ_DVD_STRUCTURE	    0xad
 254.460 +#define GPCMD_READ_FORMAT_CAPACITIES	    0x23
 254.461 +#define GPCMD_READ_HEADER		    0x44
 254.462 +#define GPCMD_READ_TRACK_RZONE_INFO	    0x52
 254.463 +#define GPCMD_READ_SUBCHANNEL		    0x42
 254.464 +#define GPCMD_READ_TOC_PMA_ATIP		    0x43
 254.465 +#define GPCMD_REPAIR_RZONE_TRACK	    0x58
 254.466 +#define GPCMD_REPORT_KEY		    0xa4
 254.467 +#define GPCMD_REQUEST_SENSE		    0x03
 254.468 +#define GPCMD_RESERVE_RZONE_TRACK	    0x53
 254.469 +#define GPCMD_SCAN			    0xba
 254.470 +#define GPCMD_SEEK			    0x2b
 254.471 +#define GPCMD_SEND_DVD_STRUCTURE	    0xad
 254.472 +#define GPCMD_SEND_EVENT		    0xa2
 254.473 +#define GPCMD_SEND_KEY			    0xa3
 254.474 +#define GPCMD_SEND_OPC			    0x54
 254.475 +#define GPCMD_SET_READ_AHEAD		    0xa7
 254.476 +#define GPCMD_SET_STREAMING		    0xb6
 254.477 +#define GPCMD_START_STOP_UNIT		    0x1b
 254.478 +#define GPCMD_STOP_PLAY_SCAN		    0x4e
 254.479 +#define GPCMD_TEST_UNIT_READY		    0x00
 254.480 +#define GPCMD_VERIFY_10			    0x2f
 254.481 +#define GPCMD_WRITE_10			    0x2a
 254.482 +#define GPCMD_WRITE_AND_VERIFY_10	    0x2e
 254.483 +/* This is listed as optional in ATAPI 2.6, but is (curiously) 
 254.484 + * missing from Mt. Fuji, Table 57.  It _is_ mentioned in Mt. Fuji
 254.485 + * Table 377 as an MMC command for SCSi devices though...  Most ATAPI
 254.486 + * drives support it. */
 254.487 +#define GPCMD_SET_SPEED			    0xbb
 254.488 +/* This seems to be a SCSI specific CD-ROM opcode 
 254.489 + * to play data at track/index */
 254.490 +#define GPCMD_PLAYAUDIO_TI		    0x48
 254.491 +/*
 254.492 + * From MS Media Status Notification Support Specification. For
 254.493 + * older drives only.
 254.494 + */
 254.495 +#define GPCMD_GET_MEDIA_STATUS		    0xda
 254.496 +
 254.497 +/* Mode page codes for mode sense/set */
 254.498 +#define GPMODE_R_W_ERROR_PAGE		0x01
 254.499 +#define GPMODE_WRITE_PARMS_PAGE		0x05
 254.500 +#define GPMODE_AUDIO_CTL_PAGE		0x0e
 254.501 +#define GPMODE_POWER_PAGE		0x1a
 254.502 +#define GPMODE_FAULT_FAIL_PAGE		0x1c
 254.503 +#define GPMODE_TO_PROTECT_PAGE		0x1d
 254.504 +#define GPMODE_CAPABILITIES_PAGE	0x2a
 254.505 +#define GPMODE_ALL_PAGES		0x3f
 254.506 +/* Not in Mt. Fuji, but in ATAPI 2.6 -- depricated now in favor
 254.507 + * of MODE_SENSE_POWER_PAGE */
 254.508 +#define GPMODE_CDROM_PAGE		0x0d
 254.509 +
 254.510 +
 254.511 +
 254.512 +/* DVD struct types */
 254.513 +#define DVD_STRUCT_PHYSICAL	0x00
 254.514 +#define DVD_STRUCT_COPYRIGHT	0x01
 254.515 +#define DVD_STRUCT_DISCKEY	0x02
 254.516 +#define DVD_STRUCT_BCA		0x03
 254.517 +#define DVD_STRUCT_MANUFACT	0x04
 254.518 +
 254.519 +struct dvd_layer {
 254.520 +	__u8 book_version	: 4;
 254.521 +	__u8 book_type		: 4;
 254.522 +	__u8 min_rate		: 4;
 254.523 +	__u8 disc_size		: 4;
 254.524 +	__u8 layer_type		: 4;
 254.525 +	__u8 track_path		: 1;
 254.526 +	__u8 nlayers		: 2;
 254.527 +	__u8 track_density	: 4;
 254.528 +	__u8 linear_density	: 4;
 254.529 +	__u8 bca		: 1;
 254.530 +	__u32 start_sector;
 254.531 +	__u32 end_sector;
 254.532 +	__u32 end_sector_l0;
 254.533 +};
 254.534 +
 254.535 +#define DVD_LAYERS	4
 254.536 +
 254.537 +struct dvd_physical {
 254.538 +	__u8 type;
 254.539 +	__u8 layer_num;
 254.540 +	struct dvd_layer layer[DVD_LAYERS];
 254.541 +};
 254.542 +
 254.543 +struct dvd_copyright {
 254.544 +	__u8 type;
 254.545 +
 254.546 +	__u8 layer_num;
 254.547 +	__u8 cpst;
 254.548 +	__u8 rmi;
 254.549 +};
 254.550 +
 254.551 +struct dvd_disckey {
 254.552 +	__u8 type;
 254.553 +
 254.554 +	unsigned agid		: 2;
 254.555 +	__u8 value[2048];
 254.556 +};
 254.557 +
 254.558 +struct dvd_bca {
 254.559 +	__u8 type;
 254.560 +
 254.561 +	int len;
 254.562 +	__u8 value[188];
 254.563 +};
 254.564 +
 254.565 +struct dvd_manufact {
 254.566 +	__u8 type;
 254.567 +
 254.568 +	__u8 layer_num;
 254.569 +	int len;
 254.570 +	__u8 value[2048];
 254.571 +};
 254.572 +
 254.573 +typedef union {
 254.574 +	__u8 type;
 254.575 +
 254.576 +	struct dvd_physical	physical;
 254.577 +	struct dvd_copyright	copyright;
 254.578 +	struct dvd_disckey	disckey;
 254.579 +	struct dvd_bca		bca;
 254.580 +	struct dvd_manufact	manufact;
 254.581 +} dvd_struct;
 254.582 +
 254.583 +/*
 254.584 + * DVD authentication ioctl
 254.585 + */
 254.586 +
 254.587 +/* Authentication states */
 254.588 +#define DVD_LU_SEND_AGID	0
 254.589 +#define DVD_HOST_SEND_CHALLENGE	1
 254.590 +#define DVD_LU_SEND_KEY1	2
 254.591 +#define DVD_LU_SEND_CHALLENGE	3
 254.592 +#define DVD_HOST_SEND_KEY2	4
 254.593 +
 254.594 +/* Termination states */
 254.595 +#define DVD_AUTH_ESTABLISHED	5
 254.596 +#define DVD_AUTH_FAILURE	6
 254.597 +
 254.598 +/* Other functions */
 254.599 +#define DVD_LU_SEND_TITLE_KEY	7
 254.600 +#define DVD_LU_SEND_ASF		8
 254.601 +#define DVD_INVALIDATE_AGID	9
 254.602 +#define DVD_LU_SEND_RPC_STATE	10
 254.603 +#define DVD_HOST_SEND_RPC_STATE	11
 254.604 +
 254.605 +/* State data */
 254.606 +typedef __u8 dvd_key[5];		/* 40-bit value, MSB is first elem. */
 254.607 +typedef __u8 dvd_challenge[10];	/* 80-bit value, MSB is first elem. */
 254.608 +
 254.609 +struct dvd_lu_send_agid {
 254.610 +	__u8 type;
 254.611 +	unsigned agid		: 2;
 254.612 +};
 254.613 +
 254.614 +struct dvd_host_send_challenge {
 254.615 +	__u8 type;
 254.616 +	unsigned agid		: 2;
 254.617 +
 254.618 +	dvd_challenge chal;
 254.619 +};
 254.620 +
 254.621 +struct dvd_send_key {
 254.622 +	__u8 type;
 254.623 +	unsigned agid		: 2;
 254.624 +
 254.625 +	dvd_key key;
 254.626 +};
 254.627 +
 254.628 +struct dvd_lu_send_challenge {
 254.629 +	__u8 type;
 254.630 +	unsigned agid		: 2;
 254.631 +
 254.632 +	dvd_challenge chal;
 254.633 +};
 254.634 +
 254.635 +#define DVD_CPM_NO_COPYRIGHT	0
 254.636 +#define DVD_CPM_COPYRIGHTED	1
 254.637 +
 254.638 +#define DVD_CP_SEC_NONE		0
 254.639 +#define DVD_CP_SEC_EXIST	1
 254.640 +
 254.641 +#define DVD_CGMS_UNRESTRICTED	0
 254.642 +#define DVD_CGMS_SINGLE		2
 254.643 +#define DVD_CGMS_RESTRICTED	3
 254.644 +
 254.645 +struct dvd_lu_send_title_key {
 254.646 +	__u8 type;
 254.647 +	unsigned agid		: 2;
 254.648 +
 254.649 +	dvd_key title_key;
 254.650 +	int lba;
 254.651 +	unsigned cpm		: 1;
 254.652 +	unsigned cp_sec		: 1;
 254.653 +	unsigned cgms		: 2;
 254.654 +};
 254.655 +
 254.656 +struct dvd_lu_send_asf {
 254.657 +	__u8 type;
 254.658 +	unsigned agid		: 2;
 254.659 +
 254.660 +	unsigned asf		: 1;
 254.661 +};
 254.662 +
 254.663 +struct dvd_host_send_rpcstate {
 254.664 +	__u8 type;
 254.665 +	__u8 pdrc;
 254.666 +};
 254.667 +
 254.668 +struct dvd_lu_send_rpcstate {
 254.669 +	__u8 type		: 2;
 254.670 +	__u8 vra		: 3;
 254.671 +	__u8 ucca		: 3;
 254.672 +	__u8 region_mask;
 254.673 +	__u8 rpc_scheme;
 254.674 +};
 254.675 +
 254.676 +typedef union {
 254.677 +	__u8 type;
 254.678 +
 254.679 +	struct dvd_lu_send_agid		lsa;
 254.680 +	struct dvd_host_send_challenge	hsc;
 254.681 +	struct dvd_send_key		lsk;
 254.682 +	struct dvd_lu_send_challenge	lsc;
 254.683 +	struct dvd_send_key		hsk;
 254.684 +	struct dvd_lu_send_title_key	lstk;
 254.685 +	struct dvd_lu_send_asf		lsasf;
 254.686 +	struct dvd_host_send_rpcstate	hrpcs;
 254.687 +	struct dvd_lu_send_rpcstate	lrpcs;
 254.688 +} dvd_authinfo;
 254.689 +
 254.690 +struct request_sense {
 254.691 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.692 +	__u8 valid		: 1;
 254.693 +	__u8 error_code		: 7;
 254.694 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.695 +	__u8 error_code		: 7;
 254.696 +	__u8 valid		: 1;
 254.697 +#endif
 254.698 +	__u8 segment_number;
 254.699 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.700 +	__u8 reserved1		: 2;
 254.701 +	__u8 ili		: 1;
 254.702 +	__u8 reserved2		: 1;
 254.703 +	__u8 sense_key		: 4;
 254.704 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.705 +	__u8 sense_key		: 4;
 254.706 +	__u8 reserved2		: 1;
 254.707 +	__u8 ili		: 1;
 254.708 +	__u8 reserved1		: 2;
 254.709 +#endif
 254.710 +	__u8 information[4];
 254.711 +	__u8 add_sense_len;
 254.712 +	__u8 command_info[4];
 254.713 +	__u8 asc;
 254.714 +	__u8 ascq;
 254.715 +	__u8 fruc;
 254.716 +	__u8 sks[3];
 254.717 +	__u8 asb[46];
 254.718 +};
 254.719 +
 254.720 +#ifdef __KERNEL__
 254.721 +#if 0
 254.722 +#include <xen/devfs_fs_kernel.h>
 254.723 +#else
 254.724 +#include <xen/kdev_t.h>
 254.725 +#endif
 254.726 +
 254.727 +struct cdrom_write_settings {
 254.728 +	unsigned char fpacket;		/* fixed/variable packets */
 254.729 +	unsigned long packet_size;	/* write out this number of packets */
 254.730 +	unsigned long nwa;		/* next writeable address */
 254.731 +	unsigned char writeable;	/* cdrom is writeable */
 254.732 +};
 254.733 +
 254.734 +/* Uniform cdrom data structures for cdrom.c */
 254.735 +struct cdrom_device_info {
 254.736 +	struct cdrom_device_ops  *ops;  /* link to device_ops */
 254.737 +	struct cdrom_device_info *next; /* next device_info for this major */
 254.738 +	void *handle;		        /* driver-dependent data */
 254.739 +#if 0
 254.740 +	devfs_handle_t de;		/* real driver should create this  */
 254.741 +#endif
 254.742 +	int number;			/* generic driver updates this  */
 254.743 +/* specifications */
 254.744 +        kdev_t dev;	                /* device number */
 254.745 +	int mask;                       /* mask of capability: disables them */
 254.746 +	int speed;			/* maximum speed for reading data */
 254.747 +	int capacity;			/* number of discs in jukebox */
 254.748 +/* device-related storage */
 254.749 +	int options		: 30;	/* options flags */
 254.750 +	unsigned mc_flags	: 2;	/* media change buffer flags */
 254.751 +    	int use_count;                  /* number of times device opened */
 254.752 +    	char name[20];                  /* name of the device type */
 254.753 +/* per-device flags */
 254.754 +        __u8 sanyo_slot		: 2;	/* Sanyo 3 CD changer support */
 254.755 +        __u8 reserved		: 6;	/* not used yet */
 254.756 +	struct cdrom_write_settings write;
 254.757 +};
 254.758 +
 254.759 +struct cdrom_device_ops {
 254.760 +/* routines */
 254.761 +	int (*open) (struct cdrom_device_info *, int);
 254.762 +	void (*release) (struct cdrom_device_info *);
 254.763 +	int (*drive_status) (struct cdrom_device_info *, int);
 254.764 +	int (*media_changed) (struct cdrom_device_info *, int);
 254.765 +	int (*tray_move) (struct cdrom_device_info *, int);
 254.766 +	int (*lock_door) (struct cdrom_device_info *, int);
 254.767 +	int (*select_speed) (struct cdrom_device_info *, int);
 254.768 +	int (*select_disc) (struct cdrom_device_info *, int);
 254.769 +	int (*get_last_session) (struct cdrom_device_info *,
 254.770 +				 struct cdrom_multisession *);
 254.771 +	int (*get_mcn) (struct cdrom_device_info *,
 254.772 +			struct cdrom_mcn *);
 254.773 +	/* hard reset device */
 254.774 +	int (*reset) (struct cdrom_device_info *);
 254.775 +	/* play stuff */
 254.776 +	int (*audio_ioctl) (struct cdrom_device_info *,unsigned int, void *);
 254.777 +	/* dev-specific */
 254.778 + 	int (*dev_ioctl) (struct cdrom_device_info *,
 254.779 +			  unsigned int, unsigned long);
 254.780 +/* driver specifications */
 254.781 +	const int capability;   /* capability flags */
 254.782 +	int n_minors;           /* number of active minor devices */
 254.783 +	/* handle uniform packets for scsi type devices (scsi,atapi) */
 254.784 +	int (*generic_packet) (struct cdrom_device_info *,
 254.785 +			       struct cdrom_generic_command *);
 254.786 +};
 254.787 +
 254.788 +/* the general block_device operations structure: */
 254.789 +#include <xen/blkdev.h> /* XXX SMH: pull in wafer thin file and inode defns */
 254.790 +extern int cdrom_open(struct inode *, struct file *);
 254.791 +extern int cdrom_release(struct inode *, struct file *);
 254.792 +extern int cdrom_ioctl(struct inode *, struct file *, unsigned, unsigned long);
 254.793 +extern int cdrom_media_changed(kdev_t);
 254.794 +
 254.795 +extern int register_cdrom(struct cdrom_device_info *cdi);
 254.796 +extern int unregister_cdrom(struct cdrom_device_info *cdi);
 254.797 +
 254.798 +#if 0
 254.799 +static inline void devfs_plain_cdrom(struct cdrom_device_info *cdi,
 254.800 +				struct block_device_operations *ops)
 254.801 +{
 254.802 +	char vname[23];
 254.803 +
 254.804 +	sprintf (vname, "cdroms/cdrom%d", cdi->number);
 254.805 +	cdi->de = devfs_register (NULL, vname, DEVFS_FL_DEFAULT,
 254.806 +				    MAJOR (cdi->dev), MINOR (cdi->dev),
 254.807 +				    S_IFBLK | S_IRUGO | S_IWUGO,
 254.808 +				    ops, NULL);
 254.809 +}
 254.810 +#endif
 254.811 +
 254.812 +typedef struct {
 254.813 +    int data;
 254.814 +    int audio;
 254.815 +    int cdi;
 254.816 +    int xa;
 254.817 +    long error;
 254.818 +} tracktype;
 254.819 +
 254.820 +extern void cdrom_count_tracks(struct cdrom_device_info *cdi,tracktype* tracks);
 254.821 +extern int cdrom_get_next_writable(kdev_t dev, long *next_writable);
 254.822 +extern int cdrom_get_last_written(kdev_t dev, long *last_written);
 254.823 +extern int cdrom_number_of_slots(struct cdrom_device_info *cdi);
 254.824 +extern int cdrom_select_disc(struct cdrom_device_info *cdi, int slot);
 254.825 +extern int cdrom_mode_select(struct cdrom_device_info *cdi,
 254.826 +			     struct cdrom_generic_command *cgc);
 254.827 +extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
 254.828 +			    struct cdrom_generic_command *cgc,
 254.829 +			    int page_code, int page_control);
 254.830 +extern void init_cdrom_command(struct cdrom_generic_command *cgc,
 254.831 +			       void *buffer, int len, int type);
 254.832 +extern struct cdrom_device_info *cdrom_find_device(kdev_t dev);
 254.833 +
 254.834 +typedef struct {
 254.835 +	__u16 disc_information_length;
 254.836 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.837 +	__u8 reserved1			: 3;
 254.838 +        __u8 erasable			: 1;
 254.839 +        __u8 border_status		: 2;
 254.840 +        __u8 disc_status		: 2;
 254.841 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.842 +        __u8 disc_status		: 2;
 254.843 +        __u8 border_status		: 2;
 254.844 +        __u8 erasable			: 1;
 254.845 +	__u8 reserved1			: 3;
 254.846 +#else
 254.847 +#error "Please fix <asm/byteorder.h>"
 254.848 +#endif
 254.849 +	__u8 n_first_track;
 254.850 +	__u8 n_sessions_lsb;
 254.851 +	__u8 first_track_lsb;
 254.852 +	__u8 last_track_lsb;
 254.853 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.854 +	__u8 did_v			: 1;
 254.855 +        __u8 dbc_v			: 1;
 254.856 +        __u8 uru			: 1;
 254.857 +        __u8 reserved2			: 5;
 254.858 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.859 +        __u8 reserved2			: 5;
 254.860 +        __u8 uru			: 1;
 254.861 +        __u8 dbc_v			: 1;
 254.862 +	__u8 did_v			: 1;
 254.863 +#endif
 254.864 +	__u8 disc_type;
 254.865 +	__u8 n_sessions_msb;
 254.866 +	__u8 first_track_msb;
 254.867 +	__u8 last_track_msb;
 254.868 +	__u32 disc_id;
 254.869 +	__u32 lead_in;
 254.870 +	__u32 lead_out;
 254.871 +	__u8 disc_bar_code[8];
 254.872 +	__u8 reserved3;
 254.873 +	__u8 n_opc;
 254.874 +} disc_information;
 254.875 +
 254.876 +typedef struct {
 254.877 +	__u16 track_information_length;
 254.878 +	__u8 track_lsb;
 254.879 +	__u8 session_lsb;
 254.880 +	__u8 reserved1;
 254.881 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.882 +	__u8 reserved2			: 2;
 254.883 +        __u8 damage			: 1;
 254.884 +        __u8 copy			: 1;
 254.885 +        __u8 track_mode			: 4;
 254.886 +	__u8 rt				: 1;
 254.887 +	__u8 blank			: 1;
 254.888 +	__u8 packet			: 1;
 254.889 +	__u8 fp				: 1;
 254.890 +	__u8 data_mode			: 4;
 254.891 +	__u8 reserved3			: 6;
 254.892 +	__u8 lra_v			: 1;
 254.893 +	__u8 nwa_v			: 1;
 254.894 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.895 +        __u8 track_mode			: 4;
 254.896 +        __u8 copy			: 1;
 254.897 +        __u8 damage			: 1;
 254.898 +	__u8 reserved2			: 2;
 254.899 +	__u8 data_mode			: 4;
 254.900 +	__u8 fp				: 1;
 254.901 +	__u8 packet			: 1;
 254.902 +	__u8 blank			: 1;
 254.903 +	__u8 rt				: 1;
 254.904 +	__u8 nwa_v			: 1;
 254.905 +	__u8 lra_v			: 1;
 254.906 +	__u8 reserved3			: 6;
 254.907 +#endif
 254.908 +	__u32 track_start;
 254.909 +	__u32 next_writable;
 254.910 +	__u32 free_blocks;
 254.911 +	__u32 fixed_packet_size;
 254.912 +	__u32 track_size;
 254.913 +	__u32 last_rec_address;
 254.914 +} track_information;
 254.915 +
 254.916 +extern int cdrom_get_disc_info(kdev_t dev, disc_information *di);
 254.917 +extern int cdrom_get_track_info(kdev_t dev, __u16 track, __u8 type,
 254.918 +				track_information *ti);
 254.919 +
 254.920 +/* The SCSI spec says there could be 256 slots. */
 254.921 +#define CDROM_MAX_SLOTS	256
 254.922 +
 254.923 +struct cdrom_mechstat_header {
 254.924 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.925 +	__u8 fault         : 1;
 254.926 +	__u8 changer_state : 2;
 254.927 +	__u8 curslot       : 5;
 254.928 +	__u8 mech_state    : 3;
 254.929 +	__u8 door_open     : 1;
 254.930 +	__u8 reserved1     : 4;
 254.931 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.932 +	__u8 curslot       : 5;
 254.933 +	__u8 changer_state : 2;
 254.934 +	__u8 fault         : 1;
 254.935 +	__u8 reserved1     : 4;
 254.936 +	__u8 door_open     : 1;
 254.937 +	__u8 mech_state    : 3;
 254.938 +#endif
 254.939 +	__u8     curlba[3];
 254.940 +	__u8     nslots;
 254.941 +	__u16 slot_tablelen;
 254.942 +};
 254.943 +
 254.944 +struct cdrom_slot {
 254.945 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.946 +	__u8 disc_present : 1;
 254.947 +	__u8 reserved1    : 6;
 254.948 +	__u8 change       : 1;
 254.949 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.950 +	__u8 change       : 1;
 254.951 +	__u8 reserved1    : 6;
 254.952 +	__u8 disc_present : 1;
 254.953 +#endif
 254.954 +	__u8 reserved2[3];
 254.955 +};
 254.956 +
 254.957 +struct cdrom_changer_info {
 254.958 +	struct cdrom_mechstat_header hdr;
 254.959 +	struct cdrom_slot slots[CDROM_MAX_SLOTS];
 254.960 +};
 254.961 +
 254.962 +typedef enum {
 254.963 +	mechtype_caddy = 0,
 254.964 +	mechtype_tray  = 1,
 254.965 +	mechtype_popup = 2,
 254.966 +	mechtype_individual_changer = 4,
 254.967 +	mechtype_cartridge_changer  = 5
 254.968 +} mechtype_t;
 254.969 +
 254.970 +struct mode_page_header {
 254.971 +	__u16 mode_data_length;
 254.972 +	__u8 medium_type;
 254.973 +	__u8 reserved1;
 254.974 +	__u8 reserved2;
 254.975 +	__u8 reserved3;
 254.976 +	__u16 desc_length;
 254.977 +};
 254.978 +
 254.979 +typedef struct {
 254.980 +#if defined(__BIG_ENDIAN_BITFIELD)
 254.981 +	__u8 ps			: 1;
 254.982 +	__u8 reserved1		: 1;
 254.983 +	__u8 page_code		: 6;
 254.984 +        __u8 page_length;
 254.985 +	__u8 reserved2		: 1;
 254.986 +	__u8 bufe		: 1;
 254.987 +	__u8 ls_v		: 1;
 254.988 +	__u8 test_write		: 1;
 254.989 +        __u8 write_type		: 4;
 254.990 +	__u8 multi_session	: 2; /* or border, DVD */
 254.991 +	__u8 fp			: 1;
 254.992 +	__u8 copy		: 1;
 254.993 +	__u8 track_mode		: 4;
 254.994 +	__u8 reserved3		: 4;
 254.995 +	__u8 data_block_type	: 4;
 254.996 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
 254.997 +	__u8 page_code		: 6;
 254.998 +	__u8 reserved1		: 1;
 254.999 +	__u8 ps			: 1;
254.1000 +        __u8 page_length;
254.1001 +        __u8 write_type		: 4;
254.1002 +	__u8 test_write		: 1;
254.1003 +	__u8 ls_v		: 1;
254.1004 +	__u8 bufe		: 1;
254.1005 +	__u8 reserved2		: 1;
254.1006 +	__u8 track_mode		: 4;
254.1007 +	__u8 copy		: 1;
254.1008 +	__u8 fp			: 1;
254.1009 +	__u8 multi_session	: 2; /* or border, DVD */
254.1010 +	__u8 data_block_type	: 4;
254.1011 +	__u8 reserved3		: 4;
254.1012 +#endif
254.1013 +	__u8 link_size;
254.1014 +	__u8 reserved4;
254.1015 +#if defined(__BIG_ENDIAN_BITFIELD)
254.1016 +	__u8 reserved5		: 2;
254.1017 +	__u8 app_code		: 6;
254.1018 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
254.1019 +	__u8 app_code		: 6;
254.1020 +	__u8 reserved5		: 2;
254.1021 +#endif
254.1022 +	__u8 session_format;
254.1023 +	__u8 reserved6;
254.1024 +	__u32 packet_size;
254.1025 +	__u16 audio_pause;
254.1026 +	__u8 mcn[16];
254.1027 +	__u8 isrc[16];
254.1028 +	__u8 subhdr0;
254.1029 +	__u8 subhdr1;
254.1030 +	__u8 subhdr2;
254.1031 +	__u8 subhdr3;
254.1032 +} __attribute__((packed)) write_param_page;
254.1033 +
254.1034 +struct modesel_head
254.1035 +{
254.1036 +	__u8	reserved1;
254.1037 +	__u8	medium;
254.1038 +	__u8	reserved2;
254.1039 +	__u8	block_desc_length;
254.1040 +	__u8	density;
254.1041 +	__u8	number_of_blocks_hi;
254.1042 +	__u8	number_of_blocks_med;
254.1043 +	__u8	number_of_blocks_lo;
254.1044 +	__u8	reserved3;
254.1045 +	__u8	block_length_hi;
254.1046 +	__u8	block_length_med;
254.1047 +	__u8	block_length_lo;
254.1048 +};
254.1049 +
254.1050 +typedef struct {
254.1051 +	__u16 report_key_length;
254.1052 +	__u8 reserved1;
254.1053 +	__u8 reserved2;
254.1054 +#if defined(__BIG_ENDIAN_BITFIELD)
254.1055 +	__u8 type_code			: 2;
254.1056 +	__u8 vra			: 3;
254.1057 +	__u8 ucca			: 3;
254.1058 +#elif defined(__LITTLE_ENDIAN_BITFIELD)
254.1059 +	__u8 ucca			: 3;
254.1060 +	__u8 vra			: 3;
254.1061 +	__u8 type_code			: 2;
254.1062 +#endif
254.1063 +	__u8 region_mask;
254.1064 +	__u8 rpc_scheme;
254.1065 +	__u8 reserved3;
254.1066 +} rpc_state_t;
254.1067 +
254.1068 +#endif  /* End of kernel only stuff */ 
254.1069 +
254.1070 +#endif  /* _LINUX_CDROM_H */
   255.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   255.2 +++ b/xen/include/xen/compiler.h	Tue Mar 23 09:48:06 2004 +0000
   255.3 @@ -0,0 +1,16 @@
   255.4 +#ifndef __LINUX_COMPILER_H
   255.5 +#define __LINUX_COMPILER_H
   255.6 +
   255.7 +/* Somewhere in the middle of the GCC 2.96 development cycle, we implemented
   255.8 +   a mechanism by which the user can annotate likely branch directions and
   255.9 +   expect the blocks to be reordered appropriately.  Define __builtin_expect
  255.10 +   to nothing for earlier compilers.  */
  255.11 +
  255.12 +#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
  255.13 +#define __builtin_expect(x, expected_value) (x)
  255.14 +#endif
  255.15 +
  255.16 +#define likely(x)	__builtin_expect((x),1)
  255.17 +#define unlikely(x)	__builtin_expect((x),0)
  255.18 +
  255.19 +#endif /* __LINUX_COMPILER_H */
   256.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   256.2 +++ b/xen/include/xen/config.h	Tue Mar 23 09:48:06 2004 +0000
   256.3 @@ -0,0 +1,45 @@
   256.4 +/******************************************************************************
   256.5 + * config.h
   256.6 + * 
   256.7 + * A Linux-style configuration list.
   256.8 + */
   256.9 +
  256.10 +#ifndef __XENO_CONFIG_H__
  256.11 +#define __XENO_CONFIG_H__
  256.12 +
  256.13 +#include <asm/config.h>
  256.14 +
  256.15 +/* syslog levels ==> nothing! */
  256.16 +#define KERN_NOTICE  ""
  256.17 +#define KERN_WARNING ""
  256.18 +#define KERN_DEBUG   ""
  256.19 +#define KERN_INFO    ""
  256.20 +#define KERN_ERR     ""
  256.21 +#define KERN_CRIT    ""
  256.22 +#define KERN_EMERG   ""
  256.23 +#define KERN_ALERT   ""
  256.24 +
  256.25 +#define offsetof(_p,_f) ((unsigned long)&(((_p *)0)->_f))
  256.26 +#define struct_cpy(_x,_y) (memcpy((_x),(_y),sizeof(*(_x))))
  256.27 +
  256.28 +#define dev_probe_lock() ((void)0)
  256.29 +#define dev_probe_unlock() ((void)0)
  256.30 +
  256.31 +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  256.32 +
  256.33 +#define capable(_c) 0
  256.34 +
  256.35 +#ifndef NDEBUG
  256.36 +#define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
  256.37 +                           __FILE__ , __LINE__ , ## _a )
  256.38 +#else
  256.39 +#define DPRINTK(_f, _a...) ((void)0)
  256.40 +#endif
  256.41 +
  256.42 +#ifndef __ASSEMBLY__
  256.43 +#include <xen/compiler.h>
  256.44 +extern unsigned int opt_ser_baud;
  256.45 +#define SERIAL_ENABLED (opt_ser_baud != 0)
  256.46 +#endif
  256.47 +
  256.48 +#endif /* __XENO_CONFIG_H__ */
   257.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   257.2 +++ b/xen/include/xen/console.h	Tue Mar 23 09:48:06 2004 +0000
   257.3 @@ -0,0 +1,31 @@
   257.4 +/******************************************************************************
   257.5 + * xen/console.h
   257.6 + * 
   257.7 + * Xen header file concerning console access.
   257.8 + * 
   257.9 + * Copyright (c) 2003 James Scott, Intel Research Cambridge
  257.10 + */
  257.11 +
  257.12 +#ifndef __CONSOLE_H__
  257.13 +#define __CONSOLE_H__
  257.14 +
  257.15 +#include <xen/spinlock.h>
  257.16 +
  257.17 +extern spinlock_t console_lock;
  257.18 +
  257.19 +/*
  257.20 + * Ownership of console --- currently hardwired to dom0. This is used to see 
  257.21 + * who gets the PS/2 keyboard/mouse events
  257.22 + */
  257.23 +#define CONSOLE_ISOWNER(p) (p->domain == 0) 
  257.24 +#define CONSOLE_OWNER      (find_domain_by_id(0))
  257.25 +
  257.26 +void set_printk_prefix(const char *prefix);
  257.27 +
  257.28 +#define CONSOLE_RING_CLEAR 1
  257.29 +long read_console_ring(unsigned long, unsigned int, unsigned int);
  257.30 +
  257.31 +void init_console(void);
  257.32 +void console_endboot(int disable_vga);
  257.33 +
  257.34 +#endif
   258.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   258.2 +++ b/xen/include/xen/crc32.h	Tue Mar 23 09:48:06 2004 +0000
   258.3 @@ -0,0 +1,49 @@
   258.4 +/*
   258.5 + * crc32.h for early Linux 2.4.19pre kernel inclusion
   258.6 + * This defines ether_crc_le() and ether_crc() as inline functions
   258.7 + * This is slated to change to using the library crc32 functions
   258.8 + * as kernel 2.5.2 included at some future date.
   258.9 + */
  258.10 +#ifndef _LINUX_CRC32_H
  258.11 +#define _LINUX_CRC32_H
  258.12 +
  258.13 +#include <xen/types.h>
  258.14 +
  258.15 +/* The little-endian AUTODIN II ethernet CRC calculation.
  258.16 +   N.B. Do not use for bulk data, use a table-based routine instead.
  258.17 +   This is common code and should be moved to net/core/crc.c */
  258.18 +static unsigned const ethernet_polynomial_le = 0xedb88320U;
  258.19 +static inline unsigned ether_crc_le(int length, unsigned char *data)
  258.20 +{
  258.21 +	unsigned int crc = 0xffffffff;	/* Initial value. */
  258.22 +	while(--length >= 0) {
  258.23 +		unsigned char current_octet = *data++;
  258.24 +		int bit;
  258.25 +		for (bit = 8; --bit >= 0; current_octet >>= 1) {
  258.26 +			if ((crc ^ current_octet) & 1) {
  258.27 +				crc >>= 1;
  258.28 +				crc ^= ethernet_polynomial_le;
  258.29 +			} else
  258.30 +				crc >>= 1;
  258.31 +		}
  258.32 +	}
  258.33 +	return crc;
  258.34 +}
  258.35 +
  258.36 +static unsigned const ethernet_polynomial = 0x04c11db7U;
  258.37 +static inline u32 ether_crc(int length, unsigned char *data)
  258.38 +{
  258.39 +	int crc = -1;
  258.40 +	while (--length >= 0) {
  258.41 +		unsigned char current_octet = *data++;
  258.42 +		int bit;
  258.43 +		for (bit = 0; bit < 8; bit++, current_octet >>= 1) {
  258.44 +			crc = (crc << 1) ^
  258.45 +				((crc < 0) ^ (current_octet & 1) ?
  258.46 +				 ethernet_polynomial : 0);
  258.47 +		}
  258.48 +	}
  258.49 +	return crc;
  258.50 +}
  258.51 +
  258.52 +#endif /* _LINUX_CRC32_H */
   259.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   259.2 +++ b/xen/include/xen/ctype.h	Tue Mar 23 09:48:06 2004 +0000
   259.3 @@ -0,0 +1,54 @@
   259.4 +#ifndef _LINUX_CTYPE_H
   259.5 +#define _LINUX_CTYPE_H
   259.6 +
   259.7 +/*
   259.8 + * NOTE! This ctype does not handle EOF like the standard C
   259.9 + * library is required to.
  259.10 + */
  259.11 +
  259.12 +#define _U	0x01	/* upper */
  259.13 +#define _L	0x02	/* lower */
  259.14 +#define _D	0x04	/* digit */
  259.15 +#define _C	0x08	/* cntrl */
  259.16 +#define _P	0x10	/* punct */
  259.17 +#define _S	0x20	/* white space (space/lf/tab) */
  259.18 +#define _X	0x40	/* hex digit */
  259.19 +#define _SP	0x80	/* hard space (0x20) */
  259.20 +
  259.21 +extern unsigned char _ctype[];
  259.22 +
  259.23 +#define __ismask(x) (_ctype[(int)(unsigned char)(x)])
  259.24 +
  259.25 +#define isalnum(c)	((__ismask(c)&(_U|_L|_D)) != 0)
  259.26 +#define isalpha(c)	((__ismask(c)&(_U|_L)) != 0)
  259.27 +#define iscntrl(c)	((__ismask(c)&(_C)) != 0)
  259.28 +#define isdigit(c)	((__ismask(c)&(_D)) != 0)
  259.29 +#define isgraph(c)	((__ismask(c)&(_P|_U|_L|_D)) != 0)
  259.30 +#define islower(c)	((__ismask(c)&(_L)) != 0)
  259.31 +#define isprint(c)	((__ismask(c)&(_P|_U|_L|_D|_SP)) != 0)
  259.32 +#define ispunct(c)	((__ismask(c)&(_P)) != 0)
  259.33 +#define isspace(c)	((__ismask(c)&(_S)) != 0)
  259.34 +#define isupper(c)	((__ismask(c)&(_U)) != 0)
  259.35 +#define isxdigit(c)	((__ismask(c)&(_D|_X)) != 0)
  259.36 +
  259.37 +#define isascii(c) (((unsigned char)(c))<=0x7f)
  259.38 +#define toascii(c) (((unsigned char)(c))&0x7f)
  259.39 +
  259.40 +static inline unsigned char __tolower(unsigned char c)
  259.41 +{
  259.42 +	if (isupper(c))
  259.43 +		c -= 'A'-'a';
  259.44 +	return c;
  259.45 +}
  259.46 +
  259.47 +static inline unsigned char __toupper(unsigned char c)
  259.48 +{
  259.49 +	if (islower(c))
  259.50 +		c -= 'a'-'A';
  259.51 +	return c;
  259.52 +}
  259.53 +
  259.54 +#define tolower(c) __tolower(c)
  259.55 +#define toupper(c) __toupper(c)
  259.56 +
  259.57 +#endif
   260.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   260.2 +++ b/xen/include/xen/delay.h	Tue Mar 23 09:48:06 2004 +0000
   260.3 @@ -0,0 +1,10 @@
   260.4 +#ifndef _LINUX_DELAY_H
   260.5 +#define _LINUX_DELAY_H
   260.6 +
   260.7 +/* Copyright (C) 1993 Linus Torvalds */
   260.8 +
   260.9 +#include <asm/delay.h>
  260.10 +#define mdelay(n) (\
  260.11 +	{unsigned long msec=(n); while (msec--) udelay(1000);})
  260.12 +
  260.13 +#endif /* defined(_LINUX_DELAY_H) */
   261.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   261.2 +++ b/xen/include/xen/elevator.h	Tue Mar 23 09:48:06 2004 +0000
   261.3 @@ -0,0 +1,104 @@
   261.4 +#ifndef _LINUX_ELEVATOR_H
   261.5 +#define _LINUX_ELEVATOR_H
   261.6 +
   261.7 +typedef void (elevator_fn) (struct request *, elevator_t *,
   261.8 +			    struct list_head *,
   261.9 +			    struct list_head *, int);
  261.10 +
  261.11 +typedef int (elevator_merge_fn) (request_queue_t *, struct request **, struct list_head *,
  261.12 +				 struct buffer_head *, int, int);
  261.13 +
  261.14 +typedef void (elevator_merge_cleanup_fn) (request_queue_t *, struct request *, int);
  261.15 +
  261.16 +typedef void (elevator_merge_req_fn) (struct request *, struct request *);
  261.17 +
  261.18 +struct elevator_s
  261.19 +{
  261.20 +	int read_latency;
  261.21 +	int write_latency;
  261.22 +
  261.23 +	elevator_merge_fn *elevator_merge_fn;
  261.24 +	elevator_merge_cleanup_fn *elevator_merge_cleanup_fn;
  261.25 +	elevator_merge_req_fn *elevator_merge_req_fn;
  261.26 +
  261.27 +	unsigned int queue_ID;
  261.28 +};
  261.29 +
  261.30 +int elevator_noop_merge(request_queue_t *, struct request **, struct list_head *, struct buffer_head *, int, int);
  261.31 +void elevator_noop_merge_cleanup(request_queue_t *, struct request *, int);
  261.32 +void elevator_noop_merge_req(struct request *, struct request *);
  261.33 +
  261.34 +int elevator_linus_merge(request_queue_t *, struct request **, struct list_head *, struct buffer_head *, int, int);
  261.35 +void elevator_linus_merge_cleanup(request_queue_t *, struct request *, int);
  261.36 +void elevator_linus_merge_req(struct request *, struct request *);
  261.37 +
  261.38 +typedef struct blkelv_ioctl_arg_s {
  261.39 +	int queue_ID;
  261.40 +	int read_latency;
  261.41 +	int write_latency;
  261.42 +	int max_bomb_segments;
  261.43 +} blkelv_ioctl_arg_t;
  261.44 +
  261.45 +#define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
  261.46 +#define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
  261.47 +
  261.48 +extern int blkelvget_ioctl(elevator_t *, blkelv_ioctl_arg_t *);
  261.49 +extern int blkelvset_ioctl(elevator_t *, const blkelv_ioctl_arg_t *);
  261.50 +
  261.51 +extern void elevator_init(elevator_t *, elevator_t);
  261.52 +
  261.53 +/*
  261.54 + * Return values from elevator merger
  261.55 + */
  261.56 +#define ELEVATOR_NO_MERGE	0
  261.57 +#define ELEVATOR_FRONT_MERGE	1
  261.58 +#define ELEVATOR_BACK_MERGE	2
  261.59 +
  261.60 +/*
  261.61 + * This is used in the elevator algorithm.  We don't prioritise reads
  261.62 + * over writes any more --- although reads are more time-critical than
  261.63 + * writes, by treating them equally we increase filesystem throughput.
  261.64 + * This turns out to give better overall performance.  -- sct
  261.65 + */
  261.66 +#define IN_ORDER(s1,s2)				\
  261.67 +	((((s1)->rq_dev == (s2)->rq_dev &&	\
  261.68 +	   (s1)->sector < (s2)->sector)) ||	\
  261.69 +	 (s1)->rq_dev < (s2)->rq_dev)
  261.70 +
  261.71 +#define BHRQ_IN_ORDER(bh, rq)			\
  261.72 +	((((bh)->b_rdev == (rq)->rq_dev &&	\
  261.73 +	   (bh)->b_rsector < (rq)->sector)) ||	\
  261.74 +	 (bh)->b_rdev < (rq)->rq_dev)
  261.75 +
  261.76 +static inline int elevator_request_latency(elevator_t * elevator, int rw)
  261.77 +{
  261.78 +	int latency;
  261.79 +
  261.80 +	latency = elevator->read_latency;
  261.81 +	if (rw != READ)
  261.82 +		latency = elevator->write_latency;
  261.83 +
  261.84 +	return latency;
  261.85 +}
  261.86 +
  261.87 +#define ELEVATOR_NOOP							\
  261.88 +((elevator_t) {								\
  261.89 +	0,				/* read_latency */		\
  261.90 +	0,				/* write_latency */		\
  261.91 +									\
  261.92 +	elevator_noop_merge,		/* elevator_merge_fn */		\
  261.93 +	elevator_noop_merge_cleanup,	/* elevator_merge_cleanup_fn */	\
  261.94 +	elevator_noop_merge_req,	/* elevator_merge_req_fn */	\
  261.95 +	})
  261.96 +
  261.97 +#define ELEVATOR_LINUS							\
  261.98 +((elevator_t) {								\
  261.99 +	8192,				/* read passovers */		\
 261.100 +	16384,				/* write passovers */		\
 261.101 +									\
 261.102 +	elevator_linus_merge,		/* elevator_merge_fn */		\
 261.103 +	elevator_linus_merge_cleanup,	/* elevator_merge_cleanup_fn */	\
 261.104 +	elevator_linus_merge_req,	/* elevator_merge_req_fn */	\
 261.105 +	})
 261.106 +
 261.107 +#endif
   262.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   262.2 +++ b/xen/include/xen/errno.h	Tue Mar 23 09:48:06 2004 +0000
   262.3 @@ -0,0 +1,132 @@
   262.4 +#ifndef _I386_ERRNO_H
   262.5 +#define _I386_ERRNO_H
   262.6 +
   262.7 +#define	EPERM		 1	/* Operation not permitted */
   262.8 +#define	ENOENT		 2	/* No such file or directory */
   262.9 +#define	ESRCH		 3	/* No such process */
  262.10 +#define	EINTR		 4	/* Interrupted system call */
  262.11 +#define	EIO		 5	/* I/O error */
  262.12 +#define	ENXIO		 6	/* No such device or address */
  262.13 +#define	E2BIG		 7	/* Arg list too long */
  262.14 +#define	ENOEXEC		 8	/* Exec format error */
  262.15 +#define	EBADF		 9	/* Bad file number */
  262.16 +#define	ECHILD		10	/* No child processes */
  262.17 +#define	EAGAIN		11	/* Try again */
  262.18 +#define	ENOMEM		12	/* Out of memory */
  262.19 +#define	EACCES		13	/* Permission denied */
  262.20 +#define	EFAULT		14	/* Bad address */
  262.21 +#define	ENOTBLK		15	/* Block device required */
  262.22 +#define	EBUSY		16	/* Device or resource busy */
  262.23 +#define	EEXIST		17	/* File exists */
  262.24 +#define	EXDEV		18	/* Cross-device link */
  262.25 +#define	ENODEV		19	/* No such device */
  262.26 +#define	ENOTDIR		20	/* Not a directory */
  262.27 +#define	EISDIR		21	/* Is a directory */
  262.28 +#define	EINVAL		22	/* Invalid argument */
  262.29 +#define	ENFILE		23	/* File table overflow */
  262.30 +#define	EMFILE		24	/* Too many open files */
  262.31 +#define	ENOTTY		25	/* Not a typewriter */
  262.32 +#define	ETXTBSY		26	/* Text file busy */
  262.33 +#define	EFBIG		27	/* File too large */
  262.34 +#define	ENOSPC		28	/* No space left on device */
  262.35 +#define	ESPIPE		29	/* Illegal seek */
  262.36 +#define	EROFS		30	/* Read-only file system */
  262.37 +#define	EMLINK		31	/* Too many links */
  262.38 +#define	EPIPE		32	/* Broken pipe */
  262.39 +#define	EDOM		33	/* Math argument out of domain of func */
  262.40 +#define	ERANGE		34	/* Math result not representable */
  262.41 +#define	EDEADLK		35	/* Resource deadlock would occur */
  262.42 +#define	ENAMETOOLONG	36	/* File name too long */
  262.43 +#define	ENOLCK		37	/* No record locks available */
  262.44 +#define	ENOSYS		38	/* Function not implemented */
  262.45 +#define	ENOTEMPTY	39	/* Directory not empty */
  262.46 +#define	ELOOP		40	/* Too many symbolic links encountered */
  262.47 +#define	EWOULDBLOCK	EAGAIN	/* Operation would block */
  262.48 +#define	ENOMSG		42	/* No message of desired type */
  262.49 +#define	EIDRM		43	/* Identifier removed */
  262.50 +#define	ECHRNG		44	/* Channel number out of range */
  262.51 +#define	EL2NSYNC	45	/* Level 2 not synchronized */
  262.52 +#define	EL3HLT		46	/* Level 3 halted */
  262.53 +#define	EL3RST		47	/* Level 3 reset */
  262.54 +#define	ELNRNG		48	/* Link number out of range */
  262.55 +#define	EUNATCH		49	/* Protocol driver not attached */
  262.56 +#define	ENOCSI		50	/* No CSI structure available */
  262.57 +#define	EL2HLT		51	/* Level 2 halted */
  262.58 +#define	EBADE		52	/* Invalid exchange */
  262.59 +#define	EBADR		53	/* Invalid request descriptor */
  262.60 +#define	EXFULL		54	/* Exchange full */
  262.61 +#define	ENOANO		55	/* No anode */
  262.62 +#define	EBADRQC		56	/* Invalid request code */
  262.63 +#define	EBADSLT		57	/* Invalid slot */
  262.64 +
  262.65 +#define	EDEADLOCK	EDEADLK
  262.66 +
  262.67 +#define	EBFONT		59	/* Bad font file format */
  262.68 +#define	ENOSTR		60	/* Device not a stream */
  262.69 +#define	ENODATA		61	/* No data available */
  262.70 +#define	ETIME		62	/* Timer expired */
  262.71 +#define	ENOSR		63	/* Out of streams resources */
  262.72 +#define	ENONET		64	/* Machine is not on the network */
  262.73 +#define	ENOPKG		65	/* Package not installed */
  262.74 +#define	EREMOTE		66	/* Object is remote */
  262.75 +#define	ENOLINK		67	/* Link has been severed */
  262.76 +#define	EADV		68	/* Advertise error */
  262.77 +#define	ESRMNT		69	/* Srmount error */
  262.78 +#define	ECOMM		70	/* Communication error on send */
  262.79 +#define	EPROTO		71	/* Protocol error */
  262.80 +#define	EMULTIHOP	72	/* Multihop attempted */
  262.81 +#define	EDOTDOT		73	/* RFS specific error */
  262.82 +#define	EBADMSG		74	/* Not a data message */
  262.83 +#define	EOVERFLOW	75	/* Value too large for defined data type */
  262.84 +#define	ENOTUNIQ	76	/* Name not unique on network */
  262.85 +#define	EBADFD		77	/* File descriptor in bad state */
  262.86 +#define	EREMCHG		78	/* Remote address changed */
  262.87 +#define	ELIBACC		79	/* Can not access a needed shared library */
  262.88 +#define	ELIBBAD		80	/* Accessing a corrupted shared library */
  262.89 +#define	ELIBSCN		81	/* .lib section in a.out corrupted */
  262.90 +#define	ELIBMAX		82	/* Attempting to link in too many shared libraries */
  262.91 +#define	ELIBEXEC	83	/* Cannot exec a shared library directly */
  262.92 +#define	EILSEQ		84	/* Illegal byte sequence */
  262.93 +#define	ERESTART	85	/* Interrupted system call should be restarted */
  262.94 +#define	ESTRPIPE	86	/* Streams pipe error */
  262.95 +#define	EUSERS		87	/* Too many users */
  262.96 +#define	ENOTSOCK	88	/* Socket operation on non-socket */
  262.97 +#define	EDESTADDRREQ	89	/* Destination address required */
  262.98 +#define	EMSGSIZE	90	/* Message too long */
  262.99 +#define	EPROTOTYPE	91	/* Protocol wrong type for socket */
 262.100 +#define	ENOPROTOOPT	92	/* Protocol not available */
 262.101 +#define	EPROTONOSUPPORT	93	/* Protocol not supported */
 262.102 +#define	ESOCKTNOSUPPORT	94	/* Socket type not supported */
 262.103 +#define	EOPNOTSUPP	95	/* Operation not supported on transport endpoint */
 262.104 +#define	EPFNOSUPPORT	96	/* Protocol family not supported */
 262.105 +#define	EAFNOSUPPORT	97	/* Address family not supported by protocol */
 262.106 +#define	EADDRINUSE	98	/* Address already in use */
 262.107 +#define	EADDRNOTAVAIL	99	/* Cannot assign requested address */
 262.108 +#define	ENETDOWN	100	/* Network is down */
 262.109 +#define	ENETUNREACH	101	/* Network is unreachable */
 262.110 +#define	ENETRESET	102	/* Network dropped connection because of reset */
 262.111 +#define	ECONNABORTED	103	/* Software caused connection abort */
 262.112 +#define	ECONNRESET	104	/* Connection reset by peer */
 262.113 +#define	ENOBUFS		105	/* No buffer space available */
 262.114 +#define	EISCONN		106	/* Transport endpoint is already connected */
 262.115 +#define	ENOTCONN	107	/* Transport endpoint is not connected */
 262.116 +#define	ESHUTDOWN	108	/* Cannot send after transport endpoint shutdown */
 262.117 +#define	ETOOMANYREFS	109	/* Too many references: cannot splice */
 262.118 +#define	ETIMEDOUT	110	/* Connection timed out */
 262.119 +#define	ECONNREFUSED	111	/* Connection refused */
 262.120 +#define	EHOSTDOWN	112	/* Host is down */
 262.121 +#define	EHOSTUNREACH	113	/* No route to host */
 262.122 +#define	EALREADY	114	/* Operation already in progress */
 262.123 +#define	EINPROGRESS	115	/* Operation now in progress */
 262.124 +#define	ESTALE		116	/* Stale NFS file handle */
 262.125 +#define	EUCLEAN		117	/* Structure needs cleaning */
 262.126 +#define	ENOTNAM		118	/* Not a XENIX named type file */
 262.127 +#define	ENAVAIL		119	/* No XENIX semaphores available */
 262.128 +#define	EISNAM		120	/* Is a named type file */
 262.129 +#define	EREMOTEIO	121	/* Remote I/O error */
 262.130 +#define	EDQUOT		122	/* Quota exceeded */
 262.131 +
 262.132 +#define	ENOMEDIUM	123	/* No medium found */
 262.133 +#define	EMEDIUMTYPE	124	/* Wrong medium type */
 262.134 +
 262.135 +#endif
   263.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   263.2 +++ b/xen/include/xen/etherdevice.h	Tue Mar 23 09:48:06 2004 +0000
   263.3 @@ -0,0 +1,71 @@
   263.4 +/*
   263.5 + * INET		An implementation of the TCP/IP protocol suite for the LINUX
   263.6 + *		operating system.  NET  is implemented using the  BSD Socket
   263.7 + *		interface as the means of communication with the user level.
   263.8 + *
   263.9 + *		Definitions for the Ethernet handlers.
  263.10 + *
  263.11 + * Version:	@(#)eth.h	1.0.4	05/13/93
  263.12 + *
  263.13 + * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  263.14 + *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  263.15 + *
  263.16 + *		Relocated to include/linux where it belongs by Alan Cox 
  263.17 + *							<gw4pts@gw4pts.ampr.org>
  263.18 + *
  263.19 + *		This program is free software; you can redistribute it and/or
  263.20 + *		modify it under the terms of the GNU General Public License
  263.21 + *		as published by the Free Software Foundation; either version
  263.22 + *		2 of the License, or (at your option) any later version.
  263.23 + *
  263.24 + *	WARNING: This move may well be temporary. This file will get merged with others RSN.
  263.25 + *
  263.26 + */
  263.27 +#ifndef _LINUX_ETHERDEVICE_H
  263.28 +#define _LINUX_ETHERDEVICE_H
  263.29 +
  263.30 +#include <xen/if_ether.h>
  263.31 +#include <asm/domain_page.h>
  263.32 +
  263.33 +#ifdef __KERNEL__
  263.34 +extern int		eth_header(struct sk_buff *skb, struct net_device *dev,
  263.35 +				   unsigned short type, void *daddr,
  263.36 +				   void *saddr, unsigned len);
  263.37 +extern int		eth_rebuild_header(struct sk_buff *skb);
  263.38 +extern unsigned short	eth_type_trans(struct sk_buff *skb, struct net_device *dev);
  263.39 +extern void		eth_header_cache_update(struct hh_cache *hh, struct net_device *dev,
  263.40 +						unsigned char * haddr);
  263.41 +extern int		eth_header_cache(struct neighbour *neigh,
  263.42 +					 struct hh_cache *hh);
  263.43 +extern int		eth_header_parse(struct sk_buff *skb,
  263.44 +					 unsigned char *haddr);
  263.45 +extern struct net_device *init_etherdev(struct net_device *dev, int sizeof_priv);
  263.46 +extern struct net_device *alloc_etherdev(int sizeof_priv);
  263.47 +
  263.48 +static inline void eth_copy_and_sum (struct sk_buff *dest, unsigned char *src, int len, int base)
  263.49 +{
  263.50 +	char *vdata = map_domain_mem(__pa(dest->data));
  263.51 +	memcpy(vdata, src, len);
  263.52 +	unmap_domain_mem(vdata);
  263.53 +}
  263.54 +
  263.55 +/**
  263.56 + * is_valid_ether_addr - Determine if the given Ethernet address is valid
  263.57 + * @addr: Pointer to a six-byte array containing the Ethernet address
  263.58 + *
  263.59 + * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is not
  263.60 + * a multicast address, and is not FF:FF:FF:FF:FF:FF.  The multicast
  263.61 + * and FF:FF:... tests are combined into the single test "!(addr[0]&1)".
  263.62 + *
  263.63 + * Return true if the address is valid.
  263.64 + */
  263.65 +static inline int is_valid_ether_addr( u8 *addr )
  263.66 +{
  263.67 +	const char zaddr[6] = {0,};
  263.68 +
  263.69 +	return !(addr[0]&1) && memcmp( addr, zaddr, 6);
  263.70 +}
  263.71 +
  263.72 +#endif
  263.73 +
  263.74 +#endif	/* _LINUX_ETHERDEVICE_H */
   264.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   264.2 +++ b/xen/include/xen/ethtool.h	Tue Mar 23 09:48:06 2004 +0000
   264.3 @@ -0,0 +1,361 @@
   264.4 +/*
   264.5 + * ethtool.h: Defines for Linux ethtool.
   264.6 + *
   264.7 + * Copyright (C) 1998 David S. Miller (davem@redhat.com)
   264.8 + * Copyright 2001 Jeff Garzik <jgarzik@pobox.com>
   264.9 + * Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
  264.10 + * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
  264.11 + *                                christopher.leech@intel.com,
  264.12 + *                                scott.feldman@intel.com)
  264.13 + */
  264.14 +
  264.15 +#ifndef _LINUX_ETHTOOL_H
  264.16 +#define _LINUX_ETHTOOL_H
  264.17 +
  264.18 +
  264.19 +/* This should work for both 32 and 64 bit userland. */
  264.20 +struct ethtool_cmd {
  264.21 +	u32	cmd;
  264.22 +	u32	supported;	/* Features this interface supports */
  264.23 +	u32	advertising;	/* Features this interface advertises */
  264.24 +	u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
  264.25 +	u8	duplex;		/* Duplex, half or full */
  264.26 +	u8	port;		/* Which connector port */
  264.27 +	u8	phy_address;
  264.28 +	u8	transceiver;	/* Which tranceiver to use */
  264.29 +	u8	autoneg;	/* Enable or disable autonegotiation */
  264.30 +	u32	maxtxpkt;	/* Tx pkts before generating tx int */
  264.31 +	u32	maxrxpkt;	/* Rx pkts before generating rx int */
  264.32 +	u32	reserved[4];
  264.33 +};
  264.34 +
  264.35 +#define ETHTOOL_BUSINFO_LEN	32
  264.36 +/* these strings are set to whatever the driver author decides... */
  264.37 +struct ethtool_drvinfo {
  264.38 +	u32	cmd;
  264.39 +	char	driver[32];	/* driver short name, "tulip", "eepro100" */
  264.40 +	char	version[32];	/* driver version string */
  264.41 +	char	fw_version[32];	/* firmware version string, if applicable */
  264.42 +	char	bus_info[ETHTOOL_BUSINFO_LEN];	/* Bus info for this IF. */
  264.43 +				/* For PCI devices, use pci_dev->slot_name. */
  264.44 +	char	reserved1[32];
  264.45 +	char	reserved2[16];
  264.46 +	u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
  264.47 +	u32	testinfo_len;
  264.48 +	u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
  264.49 +	u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
  264.50 +};
  264.51 +
  264.52 +#define SOPASS_MAX	6
  264.53 +/* wake-on-lan settings */
  264.54 +struct ethtool_wolinfo {
  264.55 +	u32	cmd;
  264.56 +	u32	supported;
  264.57 +	u32	wolopts;
  264.58 +	u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
  264.59 +};
  264.60 +
  264.61 +/* for passing single values */
  264.62 +struct ethtool_value {
  264.63 +	u32	cmd;
  264.64 +	u32	data;
  264.65 +};
  264.66 +
  264.67 +/* for passing big chunks of data */
  264.68 +struct ethtool_regs {
  264.69 +	u32	cmd;
  264.70 +	u32	version; /* driver-specific, indicates different chips/revs */
  264.71 +	u32	len; /* bytes */
  264.72 +	u8	data[0];
  264.73 +};
  264.74 +
  264.75 +/* for passing EEPROM chunks */
  264.76 +struct ethtool_eeprom {
  264.77 +	u32	cmd;
  264.78 +	u32	magic;
  264.79 +	u32	offset; /* in bytes */
  264.80 +	u32	len; /* in bytes */
  264.81 +	u8	data[0];
  264.82 +};
  264.83 +
  264.84 +/* for configuring coalescing parameters of chip */
  264.85 +struct ethtool_coalesce {
  264.86 +	u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
  264.87 +
  264.88 +	/* How many usecs to delay an RX interrupt after
  264.89 +	 * a packet arrives.  If 0, only rx_max_coalesced_frames
  264.90 +	 * is used.
  264.91 +	 */
  264.92 +	u32	rx_coalesce_usecs;
  264.93 +
  264.94 +	/* How many packets to delay an RX interrupt after
  264.95 +	 * a packet arrives.  If 0, only rx_coalesce_usecs is
  264.96 +	 * used.  It is illegal to set both usecs and max frames
  264.97 +	 * to zero as this would cause RX interrupts to never be
  264.98 +	 * generated.
  264.99 +	 */
 264.100 +	u32	rx_max_coalesced_frames;
 264.101 +
 264.102 +	/* Same as above two parameters, except that these values
 264.103 +	 * apply while an IRQ is being services by the host.  Not
 264.104 +	 * all cards support this feature and the values are ignored
 264.105 +	 * in that case.
 264.106 +	 */
 264.107 +	u32	rx_coalesce_usecs_irq;
 264.108 +	u32	rx_max_coalesced_frames_irq;
 264.109 +
 264.110 +	/* How many usecs to delay a TX interrupt after
 264.111 +	 * a packet is sent.  If 0, only tx_max_coalesced_frames
 264.112 +	 * is used.
 264.113 +	 */
 264.114 +	u32	tx_coalesce_usecs;
 264.115 +
 264.116 +	/* How many packets to delay a TX interrupt after
 264.117 +	 * a packet is sent.  If 0, only tx_coalesce_usecs is
 264.118 +	 * used.  It is illegal to set both usecs and max frames
 264.119 +	 * to zero as this would cause TX interrupts to never be
 264.120 +	 * generated.
 264.121 +	 */
 264.122 +	u32	tx_max_coalesced_frames;
 264.123 +
 264.124 +	/* Same as above two parameters, except that these values
 264.125 +	 * apply while an IRQ is being services by the host.  Not
 264.126 +	 * all cards support this feature and the values are ignored
 264.127 +	 * in that case.
 264.128 +	 */
 264.129 +	u32	tx_coalesce_usecs_irq;
 264.130 +	u32	tx_max_coalesced_frames_irq;
 264.131 +
 264.132 +	/* How many usecs to delay in-memory statistics
 264.133 +	 * block updates.  Some drivers do not have an in-memory
 264.134 +	 * statistic block, and in such cases this value is ignored.
 264.135 +	 * This value must not be zero.
 264.136 +	 */
 264.137 +	u32	stats_block_coalesce_usecs;
 264.138 +
 264.139 +	/* Adaptive RX/TX coalescing is an algorithm implemented by
 264.140 +	 * some drivers to improve latency under low packet rates and
 264.141 +	 * improve throughput under high packet rates.  Some drivers
 264.142 +	 * only implement one of RX or TX adaptive coalescing.  Anything
 264.143 +	 * not implemented by the driver causes these values to be
 264.144 +	 * silently ignored.
 264.145 +	 */
 264.146 +	u32	use_adaptive_rx_coalesce;
 264.147 +	u32	use_adaptive_tx_coalesce;
 264.148 +
 264.149 +	/* When the packet rate (measured in packets per second)
 264.150 +	 * is below pkt_rate_low, the {rx,tx}_*_low parameters are
 264.151 +	 * used.
 264.152 +	 */
 264.153 +	u32	pkt_rate_low;
 264.154 +	u32	rx_coalesce_usecs_low;
 264.155 +	u32	rx_max_coalesced_frames_low;
 264.156 +	u32	tx_coalesce_usecs_low;
 264.157 +	u32	tx_max_coalesced_frames_low;
 264.158 +
 264.159 +	/* When the packet rate is below pkt_rate_high but above
 264.160 +	 * pkt_rate_low (both measured in packets per second) the
 264.161 +	 * normal {rx,tx}_* coalescing parameters are used.
 264.162 +	 */
 264.163 +
 264.164 +	/* When the packet rate is (measured in packets per second)
 264.165 +	 * is above pkt_rate_high, the {rx,tx}_*_high parameters are
 264.166 +	 * used.
 264.167 +	 */
 264.168 +	u32	pkt_rate_high;
 264.169 +	u32	rx_coalesce_usecs_high;
 264.170 +	u32	rx_max_coalesced_frames_high;
 264.171 +	u32	tx_coalesce_usecs_high;
 264.172 +	u32	tx_max_coalesced_frames_high;
 264.173 +
 264.174 +	/* How often to do adaptive coalescing packet rate sampling,
 264.175 +	 * measured in seconds.  Must not be zero.
 264.176 +	 */
 264.177 +	u32	rate_sample_interval;
 264.178 +};
 264.179 +
 264.180 +/* for configuring RX/TX ring parameters */
 264.181 +struct ethtool_ringparam {
 264.182 +	u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
 264.183 +
 264.184 +	/* Read only attributes.  These indicate the maximum number
 264.185 +	 * of pending RX/TX ring entries the driver will allow the
 264.186 +	 * user to set.
 264.187 +	 */
 264.188 +	u32	rx_max_pending;
 264.189 +	u32	rx_mini_max_pending;
 264.190 +	u32	rx_jumbo_max_pending;
 264.191 +	u32	tx_max_pending;
 264.192 +
 264.193 +	/* Values changeable by the user.  The valid values are
 264.194 +	 * in the range 1 to the "*_max_pending" counterpart above.
 264.195 +	 */
 264.196 +	u32	rx_pending;
 264.197 +	u32	rx_mini_pending;
 264.198 +	u32	rx_jumbo_pending;
 264.199 +	u32	tx_pending;
 264.200 +};
 264.201 +
 264.202 +/* for configuring link flow control parameters */
 264.203 +struct ethtool_pauseparam {
 264.204 +	u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
 264.205 +
 264.206 +	/* If the link is being auto-negotiated (via ethtool_cmd.autoneg
 264.207 +	 * being true) the user may set 'autonet' here non-zero to have the
 264.208 +	 * pause parameters be auto-negotiated too.  In such a case, the
 264.209 +	 * {rx,tx}_pause values below determine what capabilities are
 264.210 +	 * advertised.
 264.211 +	 *
 264.212 +	 * If 'autoneg' is zero or the link is not being auto-negotiated,
 264.213 +	 * then {rx,tx}_pause force the driver to use/not-use pause
 264.214 +	 * flow control.
 264.215 +	 */
 264.216 +	u32	autoneg;
 264.217 +	u32	rx_pause;
 264.218 +	u32	tx_pause;
 264.219 +};
 264.220 +
 264.221 +#define ETH_GSTRING_LEN		32
 264.222 +enum ethtool_stringset {
 264.223 +	ETH_SS_TEST		= 0,
 264.224 +	ETH_SS_STATS,
 264.225 +};
 264.226 +
 264.227 +/* for passing string sets for data tagging */
 264.228 +struct ethtool_gstrings {
 264.229 +	u32	cmd;		/* ETHTOOL_GSTRINGS */
 264.230 +	u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
 264.231 +	u32	len;		/* number of strings in the string set */
 264.232 +	u8	data[0];
 264.233 +};
 264.234 +
 264.235 +enum ethtool_test_flags {
 264.236 +	ETH_TEST_FL_OFFLINE	= (1 << 0),	/* online / offline */
 264.237 +	ETH_TEST_FL_FAILED	= (1 << 1),	/* test passed / failed */
 264.238 +};
 264.239 +
 264.240 +/* for requesting NIC test and getting results*/
 264.241 +struct ethtool_test {
 264.242 +	u32	cmd;		/* ETHTOOL_TEST */
 264.243 +	u32	flags;		/* ETH_TEST_FL_xxx */
 264.244 +	u32	reserved;
 264.245 +	u32	len;		/* result length, in number of u64 elements */
 264.246 +	u64	data[0];
 264.247 +};
 264.248 +
 264.249 +/* for dumping NIC-specific statistics */
 264.250 +struct ethtool_stats {
 264.251 +	u32	cmd;		/* ETHTOOL_GSTATS */
 264.252 +	u32	n_stats;	/* number of u64's being returned */
 264.253 +	u64	data[0];
 264.254 +};
 264.255 +
 264.256 +/* CMDs currently supported */
 264.257 +#define ETHTOOL_GSET		0x00000001 /* Get settings. */
 264.258 +#define ETHTOOL_SSET		0x00000002 /* Set settings, privileged. */
 264.259 +#define ETHTOOL_GDRVINFO	0x00000003 /* Get driver info. */
 264.260 +#define ETHTOOL_GREGS		0x00000004 /* Get NIC registers, privileged. */
 264.261 +#define ETHTOOL_GWOL		0x00000005 /* Get wake-on-lan options. */
 264.262 +#define ETHTOOL_SWOL		0x00000006 /* Set wake-on-lan options, priv. */
 264.263 +#define ETHTOOL_GMSGLVL		0x00000007 /* Get driver message level */
 264.264 +#define ETHTOOL_SMSGLVL		0x00000008 /* Set driver msg level, priv. */
 264.265 +#define ETHTOOL_NWAY_RST	0x00000009 /* Restart autonegotiation, priv. */
 264.266 +#define ETHTOOL_GLINK		0x0000000a /* Get link status (ethtool_value) */
 264.267 +#define ETHTOOL_GEEPROM		0x0000000b /* Get EEPROM data */
 264.268 +#define ETHTOOL_SEEPROM		0x0000000c /* Set EEPROM data, priv. */
 264.269 +#define ETHTOOL_GCOALESCE	0x0000000e /* Get coalesce config */
 264.270 +#define ETHTOOL_SCOALESCE	0x0000000f /* Set coalesce config, priv. */
 264.271 +#define ETHTOOL_GRINGPARAM	0x00000010 /* Get ring parameters */
 264.272 +#define ETHTOOL_SRINGPARAM	0x00000011 /* Set ring parameters, priv. */
 264.273 +#define ETHTOOL_GPAUSEPARAM	0x00000012 /* Get pause parameters */
 264.274 +#define ETHTOOL_SPAUSEPARAM	0x00000013 /* Set pause parameters, priv. */
 264.275 +#define ETHTOOL_GRXCSUM		0x00000014 /* Get RX hw csum enable (ethtool_value) */
 264.276 +#define ETHTOOL_SRXCSUM		0x00000015 /* Set RX hw csum enable (ethtool_value) */
 264.277 +#define ETHTOOL_GTXCSUM		0x00000016 /* Get TX hw csum enable (ethtool_value) */
 264.278 +#define ETHTOOL_STXCSUM		0x00000017 /* Set TX hw csum enable (ethtool_value) */
 264.279 +#define ETHTOOL_GSG		0x00000018 /* Get scatter-gather enable
 264.280 +					    * (ethtool_value) */
 264.281 +#define ETHTOOL_SSG		0x00000019 /* Set scatter-gather enable
 264.282 +					    * (ethtool_value), priv. */
 264.283 +#define ETHTOOL_TEST		0x0000001a /* execute NIC self-test, priv. */
 264.284 +#define ETHTOOL_GSTRINGS	0x0000001b /* get specified string set */
 264.285 +#define ETHTOOL_PHYS_ID		0x0000001c /* identify the NIC */
 264.286 +#define ETHTOOL_GSTATS		0x0000001d /* get NIC-specific statistics */
 264.287 +
 264.288 +/* compatibility with older code */
 264.289 +#define SPARC_ETH_GSET		ETHTOOL_GSET
 264.290 +#define SPARC_ETH_SSET		ETHTOOL_SSET
 264.291 +
 264.292 +/* Indicates what features are supported by the interface. */
 264.293 +#define SUPPORTED_10baseT_Half		(1 << 0)
 264.294 +#defi