bitkeeper revision 1.823 (4060141cL2UWa7gkwwnmGJlHbv0sAA)

Many files: xeno -> xen renames. mvdir
author: kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> 2004-03-23 10:40:28 +0000
committer: kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> 2004-03-23 10:40:28 +0000
commit: e08c905aad06e3a49269d376169be3180dcdd4e4 (patch)
tree: 7973fd2f7e385a1b20d5c801644c56fd6de51bf9
parent: e4a5ef641cce7a76b63bac12ff7a7e3dbbd10e6e (diff)
download: xen-e08c905aad06e3a49269d376169be3180dcdd4e4.tar.gz
xen-e08c905aad06e3a49269d376169be3180dcdd4e4.tar.bz2
xen-e08c905aad06e3a49269d376169be3180dcdd4e4.zip
95 files changed, 462 insertions, 462 deletions
diff --git a/.rootkeys b/.rootkeys
index 933bfc3d28..a022ce035e 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -605,86 +605,86 @@
 3eb3c87fS7DNbg0i6yhFs28UIqAK5g xen/tools/figlet/xen.flf
 3f05a939TA3SLPY7ZiScMotLjg9owQ xenolinux-2.4.25-sparse/Documentation/Configure.help
 3e5a4e6589G-U42lFKs43plskXoFxQ xenolinux-2.4.25-sparse/Makefile
-3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg xenolinux-2.4.25-sparse/arch/xeno/Makefile
-3e5a4e65n-KhsEAs-A4ULiStBp-r6w xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile
-3e5a4e65OV_j_DBtjzt5vej771AJsA xenolinux-2.4.25-sparse/arch/xeno/config.in
-3e5a4e65TNEycLeXqPSXQJQm_xGecA xenolinux-2.4.25-sparse/arch/xeno/defconfig
-3e6377f5xwPfYZkPHPrDbEq1PRN7uQ xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/Makefile
-3e6377f8Me8IqtvEhb70XFgOvqQH7A xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/balloon.c
-3e5a4e65iHEuC5sjFhj42XALYbLVRw xenolinux-2.4.25-sparse/arch/xeno/drivers/block/Makefile
-3e5a4e65pP5spJErBW69pJxSSdK9RA xenolinux-2.4.25-sparse/arch/xeno/drivers/block/block.c
-3e67f822FOPwqHiaRKbrskgWgoNL5g xenolinux-2.4.25-sparse/arch/xeno/drivers/block/block.h
-3e676eb5RXnHzSHgA1BvM0B1aIm4qg xenolinux-2.4.25-sparse/arch/xeno/drivers/block/vbd.c
-3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ xenolinux-2.4.25-sparse/arch/xeno/drivers/console/Makefile
-3e5a4e651TH-SXHoufurnWjgl5bfOA xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c
-3e5a4e656nfFISThfbyXQOA6HN6YHw xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/Makefile
-3e5a4e65BXtftInNHUC2PjDfPhdZZA xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/core.c
-3e5a4e65gfn_ltB8ujHMVFApnTTNRQ xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/vfr.c
-40420a6ebRqDjufoN1WSJvolEW2Wjw xenolinux-2.4.25-sparse/arch/xeno/drivers/evtchn/Makefile
-40420a73Wou6JlsZDiu6YwjYomsm7A xenolinux-2.4.25-sparse/arch/xeno/drivers/evtchn/evtchn.c
-3e5a4e65gZBRBB6RsSVg1c9iahigAw xenolinux-2.4.25-sparse/arch/xeno/drivers/network/Makefile
-3e5a4e65ZxKrbFetVB84JhrTyZ1YuQ xenolinux-2.4.25-sparse/arch/xeno/drivers/network/network.c
-405853f2wg7JXZJNltspMwOZJklxgw xenolinux-2.4.25-sparse/arch/xeno/drivers/vnetif/Makefile
-405853f6nbeazrNyEWNHBuoSg2PiPA xenolinux-2.4.25-sparse/arch/xeno/drivers/vnetif/vnetif.c
-3e5a4e65lWzkiPXsZdzPt2RNnJGG1g xenolinux-2.4.25-sparse/arch/xeno/kernel/Makefile
-3e5a4e65_hqfuxtGG8IUy6wRM86Ecg xenolinux-2.4.25-sparse/arch/xeno/kernel/entry.S
-3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg xenolinux-2.4.25-sparse/arch/xeno/kernel/head.S
-3e5a4e65ibVQmwlOn0j3sVH_j_6hAg xenolinux-2.4.25-sparse/arch/xeno/kernel/hypervisor.c
-3e5a4e65RMGcuA-HCn3-wNx3fFQwdg xenolinux-2.4.25-sparse/arch/xeno/kernel/i386_ksyms.c
-3e5a4e65MEvZhlr070sK5JsfAQlv7Q xenolinux-2.4.25-sparse/arch/xeno/kernel/ioport.c
-3e5a4e653U6cELGv528IxOLHvCq8iA xenolinux-2.4.25-sparse/arch/xeno/kernel/irq.c
-3e5a4e65muT6SU3ck47IP87Q7Ti5hA xenolinux-2.4.25-sparse/arch/xeno/kernel/ldt.c
-4051db84bZeRX7a_Kh6VyyDuT5FOIg xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-dma.c
-4051db89iiHs38tWGkoW_RukNyaBHw xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-i386.c
-4051db8dJYX86ZCLA-WfTW2dAyrehw xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-i386.h
-4051db91BenvDZEMZxQCGkQyJYoG5w xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-irq.c
-4051db95N9N99FjsRwi49YKUNHWI8A xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-pc.c
-4051db99fbdTHgCpjywPCp7vjLCe7Q xenolinux-2.4.25-sparse/arch/xeno/kernel/physirq.c
-3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ xenolinux-2.4.25-sparse/arch/xeno/kernel/process.c
-3e5a4e66tR-qJMLj3MppcKqmvuI2XQ xenolinux-2.4.25-sparse/arch/xeno/kernel/setup.c
-3e5a4e66fWSTagLGU2P8BGFGRjhDiw xenolinux-2.4.25-sparse/arch/xeno/kernel/signal.c
-3e5a4e66N__lUXNwzQ-eADRzK9LXuQ xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c
-3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ xenolinux-2.4.25-sparse/arch/xeno/kernel/traps.c
-3e5a4e66-9_NczrVMbuQkoSLyXckIw xenolinux-2.4.25-sparse/arch/xeno/lib/Makefile
-3e5a4e6637ZDk0BvFEC-aFQs599-ng xenolinux-2.4.25-sparse/arch/xeno/lib/delay.c
-3f68905cF5i8-NYpIhGjKmh0y8Gu5g xenolinux-2.4.25-sparse/arch/xeno/lib/xeno_proc.c
-3e5a4e66croVgpcJyJuF2ycQw0HuJw xenolinux-2.4.25-sparse/arch/xeno/mm/Makefile
-3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg xenolinux-2.4.25-sparse/arch/xeno/mm/fault.c
-3e5a4e668SE9rixq4ahho9rNhLUUFQ xenolinux-2.4.25-sparse/arch/xeno/mm/hypervisor.c
-3e5a4e661gLzzff25pJooKIIWe7IWg xenolinux-2.4.25-sparse/arch/xeno/mm/init.c
-3f0bed43UUdQichXAiVNrjV-y2Kzcg xenolinux-2.4.25-sparse/arch/xeno/mm/ioremap.c
-3e5a4e66qRlSTcjafidMB6ulECADvg xenolinux-2.4.25-sparse/arch/xeno/vmlinux.lds
+3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg xenolinux-2.4.25-sparse/arch/xen/Makefile
+3e5a4e65n-KhsEAs-A4ULiStBp-r6w xenolinux-2.4.25-sparse/arch/xen/boot/Makefile
+3e5a4e65OV_j_DBtjzt5vej771AJsA xenolinux-2.4.25-sparse/arch/xen/config.in
+3e5a4e65TNEycLeXqPSXQJQm_xGecA xenolinux-2.4.25-sparse/arch/xen/defconfig
+3e6377f5xwPfYZkPHPrDbEq1PRN7uQ xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/Makefile
+3e6377f8Me8IqtvEhb70XFgOvqQH7A xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/balloon.c
+3e5a4e65iHEuC5sjFhj42XALYbLVRw xenolinux-2.4.25-sparse/arch/xen/drivers/block/Makefile
+3e5a4e65pP5spJErBW69pJxSSdK9RA xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.c
+3e67f822FOPwqHiaRKbrskgWgoNL5g xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.h
+3e676eb5RXnHzSHgA1BvM0B1aIm4qg xenolinux-2.4.25-sparse/arch/xen/drivers/block/vbd.c
+3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ xenolinux-2.4.25-sparse/arch/xen/drivers/console/Makefile
+3e5a4e651TH-SXHoufurnWjgl5bfOA xenolinux-2.4.25-sparse/arch/xen/drivers/console/console.c
+3e5a4e656nfFISThfbyXQOA6HN6YHw xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/Makefile
+3e5a4e65BXtftInNHUC2PjDfPhdZZA xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/core.c
+3e5a4e65gfn_ltB8ujHMVFApnTTNRQ xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/vfr.c
+40420a6ebRqDjufoN1WSJvolEW2Wjw xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/Makefile
+40420a73Wou6JlsZDiu6YwjYomsm7A xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/evtchn.c
+3e5a4e65gZBRBB6RsSVg1c9iahigAw xenolinux-2.4.25-sparse/arch/xen/drivers/network/Makefile
+3e5a4e65ZxKrbFetVB84JhrTyZ1YuQ xenolinux-2.4.25-sparse/arch/xen/drivers/network/network.c
+405853f2wg7JXZJNltspMwOZJklxgw xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/Makefile
+405853f6nbeazrNyEWNHBuoSg2PiPA xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/vnetif.c
+3e5a4e65lWzkiPXsZdzPt2RNnJGG1g xenolinux-2.4.25-sparse/arch/xen/kernel/Makefile
+3e5a4e65_hqfuxtGG8IUy6wRM86Ecg xenolinux-2.4.25-sparse/arch/xen/kernel/entry.S
+3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg xenolinux-2.4.25-sparse/arch/xen/kernel/head.S
+3e5a4e65ibVQmwlOn0j3sVH_j_6hAg xenolinux-2.4.25-sparse/arch/xen/kernel/hypervisor.c
+3e5a4e65RMGcuA-HCn3-wNx3fFQwdg xenolinux-2.4.25-sparse/arch/xen/kernel/i386_ksyms.c
+3e5a4e65MEvZhlr070sK5JsfAQlv7Q xenolinux-2.4.25-sparse/arch/xen/kernel/ioport.c
+3e5a4e653U6cELGv528IxOLHvCq8iA xenolinux-2.4.25-sparse/arch/xen/kernel/irq.c
+3e5a4e65muT6SU3ck47IP87Q7Ti5hA xenolinux-2.4.25-sparse/arch/xen/kernel/ldt.c
+4051db84bZeRX7a_Kh6VyyDuT5FOIg xenolinux-2.4.25-sparse/arch/xen/kernel/pci-dma.c
+4051db89iiHs38tWGkoW_RukNyaBHw xenolinux-2.4.25-sparse/arch/xen/kernel/pci-i386.c
+4051db8dJYX86ZCLA-WfTW2dAyrehw xenolinux-2.4.25-sparse/arch/xen/kernel/pci-i386.h
+4051db91BenvDZEMZxQCGkQyJYoG5w xenolinux-2.4.25-sparse/arch/xen/kernel/pci-irq.c
+4051db95N9N99FjsRwi49YKUNHWI8A xenolinux-2.4.25-sparse/arch/xen/kernel/pci-pc.c
+4051db99fbdTHgCpjywPCp7vjLCe7Q xenolinux-2.4.25-sparse/arch/xen/kernel/physirq.c
+3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ xenolinux-2.4.25-sparse/arch/xen/kernel/process.c
+3e5a4e66tR-qJMLj3MppcKqmvuI2XQ xenolinux-2.4.25-sparse/arch/xen/kernel/setup.c
+3e5a4e66fWSTagLGU2P8BGFGRjhDiw xenolinux-2.4.25-sparse/arch/xen/kernel/signal.c
+3e5a4e66N__lUXNwzQ-eADRzK9LXuQ xenolinux-2.4.25-sparse/arch/xen/kernel/time.c
+3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ xenolinux-2.4.25-sparse/arch/xen/kernel/traps.c
+3e5a4e66-9_NczrVMbuQkoSLyXckIw xenolinux-2.4.25-sparse/arch/xen/lib/Makefile
+3e5a4e6637ZDk0BvFEC-aFQs599-ng xenolinux-2.4.25-sparse/arch/xen/lib/delay.c
+3f68905cF5i8-NYpIhGjKmh0y8Gu5g xenolinux-2.4.25-sparse/arch/xen/lib/xeno_proc.c
+3e5a4e66croVgpcJyJuF2ycQw0HuJw xenolinux-2.4.25-sparse/arch/xen/mm/Makefile
+3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg xenolinux-2.4.25-sparse/arch/xen/mm/fault.c
+3e5a4e668SE9rixq4ahho9rNhLUUFQ xenolinux-2.4.25-sparse/arch/xen/mm/hypervisor.c
+3e5a4e661gLzzff25pJooKIIWe7IWg xenolinux-2.4.25-sparse/arch/xen/mm/init.c
+3f0bed43UUdQichXAiVNrjV-y2Kzcg xenolinux-2.4.25-sparse/arch/xen/mm/ioremap.c
+3e5a4e66qRlSTcjafidMB6ulECADvg xenolinux-2.4.25-sparse/arch/xen/vmlinux.lds
 3e5a4e66mrtlmV75L1tjKDg8RaM5gA xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c
 3f108aeaLcGDgQdFAANLTUEid0a05w xenolinux-2.4.25-sparse/drivers/char/mem.c
 3e5a4e66rw65CxyolW9PKz4GG42RcA xenolinux-2.4.25-sparse/drivers/char/tty_io.c
 3e5a4e669uzIE54VwucPYtGwXLAbzA xenolinux-2.4.25-sparse/fs/exec.c
-3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.25-sparse/include/asm-xeno/bugs.h
-4048c0ddxnIa2GpBAVR-mY6mNSdeJg xenolinux-2.4.25-sparse/include/asm-xeno/control_if.h
-3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.25-sparse/include/asm-xeno/desc.h
-4048c0e0_P2wUTiT6UqgPhn0s7yFcA xenolinux-2.4.25-sparse/include/asm-xeno/evtchn.h
-3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw xenolinux-2.4.25-sparse/include/asm-xeno/fixmap.h
-3e5a4e67w_DWgjIJ17Tlossu1LGujQ xenolinux-2.4.25-sparse/include/asm-xeno/highmem.h
-3e5a4e67YtcyDLQsShhCfQwPSELfvA xenolinux-2.4.25-sparse/include/asm-xeno/hw_irq.h
-3e5a4e677VBavzM1UZIEcH1B-RlXMA xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h
-4060044fVx7-tokvNLKBf_6qBB4lqQ xenolinux-2.4.25-sparse/include/asm-xeno/io.h
-3e5a4e673p7PEOyHFm3nHkYX6HQYBg xenolinux-2.4.25-sparse/include/asm-xeno/irq.h
-3ead095db_LRUXnxaqs0dA1DWhPoQQ xenolinux-2.4.25-sparse/include/asm-xeno/keyboard.h
-3e5a4e678ddsQOpbSiRdy1GRcDc9WA xenolinux-2.4.25-sparse/include/asm-xeno/mmu_context.h
-3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ xenolinux-2.4.25-sparse/include/asm-xeno/msr.h
-3e7270deQqtGPSnFxcW4AvJZuTUWfg xenolinux-2.4.25-sparse/include/asm-xeno/multicall.h
-3e5a4e67mnQfh-R8KcQCaVo2Oho6yg xenolinux-2.4.25-sparse/include/asm-xeno/page.h
-3e5a4e67uTYU5oEnIDjxuaez8njjqg xenolinux-2.4.25-sparse/include/asm-xeno/pgalloc.h
-3e5a4e67X7JyupgdYkgDX19Huj2sAw xenolinux-2.4.25-sparse/include/asm-xeno/pgtable-2level.h
-3e5a4e67gr4NLGtQ5CvSLimMYZlkOA xenolinux-2.4.25-sparse/include/asm-xeno/pgtable.h
-3f108af1qNv8DVSGPv4zpqIU1txCkg xenolinux-2.4.25-sparse/include/asm-xeno/proc_cmd.h
-3e5a4e676uK4xErTBDH6XJREn9LSyg xenolinux-2.4.25-sparse/include/asm-xeno/processor.h
-3e5a4e67AJPjW-zL7p-xWuA6IVeH1g xenolinux-2.4.25-sparse/include/asm-xeno/ptrace.h
-3e5a4e68uJz-xI0IBVMD7xRLQKJDFg xenolinux-2.4.25-sparse/include/asm-xeno/segment.h
-3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA xenolinux-2.4.25-sparse/include/asm-xeno/smp.h
-3fa8e3f0kBLeE4To2vpdi3cpJbIkbQ xenolinux-2.4.25-sparse/include/asm-xeno/suspend.h
-3e5a4e68mTr0zcp9SXDbnd-XLrrfxw xenolinux-2.4.25-sparse/include/asm-xeno/system.h
-3f1056a9L_kqHcFheV00KbKBzv9j5w xenolinux-2.4.25-sparse/include/asm-xeno/vga.h
-3f689063nhrIRsMMZjZxMFk7iEINqQ xenolinux-2.4.25-sparse/include/asm-xeno/xeno_proc.h
+3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.25-sparse/include/asm-xen/bugs.h
+4048c0ddxnIa2GpBAVR-mY6mNSdeJg xenolinux-2.4.25-sparse/include/asm-xen/control_if.h
+3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.25-sparse/include/asm-xen/desc.h
+4048c0e0_P2wUTiT6UqgPhn0s7yFcA xenolinux-2.4.25-sparse/include/asm-xen/evtchn.h
+3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw xenolinux-2.4.25-sparse/include/asm-xen/fixmap.h
+3e5a4e67w_DWgjIJ17Tlossu1LGujQ xenolinux-2.4.25-sparse/include/asm-xen/highmem.h
+3e5a4e67YtcyDLQsShhCfQwPSELfvA xenolinux-2.4.25-sparse/include/asm-xen/hw_irq.h
+3e5a4e677VBavzM1UZIEcH1B-RlXMA xenolinux-2.4.25-sparse/include/asm-xen/hypervisor.h
+4060044fVx7-tokvNLKBf_6qBB4lqQ xenolinux-2.4.25-sparse/include/asm-xen/io.h
+3e5a4e673p7PEOyHFm3nHkYX6HQYBg xenolinux-2.4.25-sparse/include/asm-xen/irq.h
+3ead095db_LRUXnxaqs0dA1DWhPoQQ xenolinux-2.4.25-sparse/include/asm-xen/keyboard.h
+3e5a4e678ddsQOpbSiRdy1GRcDc9WA xenolinux-2.4.25-sparse/include/asm-xen/mmu_context.h
+3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ xenolinux-2.4.25-sparse/include/asm-xen/msr.h
+3e7270deQqtGPSnFxcW4AvJZuTUWfg xenolinux-2.4.25-sparse/include/asm-xen/multicall.h
+3e5a4e67mnQfh-R8KcQCaVo2Oho6yg xenolinux-2.4.25-sparse/include/asm-xen/page.h
+3e5a4e67uTYU5oEnIDjxuaez8njjqg xenolinux-2.4.25-sparse/include/asm-xen/pgalloc.h
+3e5a4e67X7JyupgdYkgDX19Huj2sAw xenolinux-2.4.25-sparse/include/asm-xen/pgtable-2level.h
+3e5a4e67gr4NLGtQ5CvSLimMYZlkOA xenolinux-2.4.25-sparse/include/asm-xen/pgtable.h
+3f108af1qNv8DVSGPv4zpqIU1txCkg xenolinux-2.4.25-sparse/include/asm-xen/proc_cmd.h
+3e5a4e676uK4xErTBDH6XJREn9LSyg xenolinux-2.4.25-sparse/include/asm-xen/processor.h
+3e5a4e67AJPjW-zL7p-xWuA6IVeH1g xenolinux-2.4.25-sparse/include/asm-xen/ptrace.h
+3e5a4e68uJz-xI0IBVMD7xRLQKJDFg xenolinux-2.4.25-sparse/include/asm-xen/segment.h
+3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA xenolinux-2.4.25-sparse/include/asm-xen/smp.h
+3fa8e3f0kBLeE4To2vpdi3cpJbIkbQ xenolinux-2.4.25-sparse/include/asm-xen/suspend.h
+3e5a4e68mTr0zcp9SXDbnd-XLrrfxw xenolinux-2.4.25-sparse/include/asm-xen/system.h
+3f1056a9L_kqHcFheV00KbKBzv9j5w xenolinux-2.4.25-sparse/include/asm-xen/vga.h
+3f689063nhrIRsMMZjZxMFk7iEINqQ xenolinux-2.4.25-sparse/include/asm-xen/xeno_proc.h
 3f056927gMHl7mWB89rb73JahbhQIA xenolinux-2.4.25-sparse/include/linux/blk.h
 3e5a4e68WLX3B8owTvktP3HHOtznPQ xenolinux-2.4.25-sparse/include/linux/major.h
 401c0590D_kwJDU59X8NyvqSv_Cl2A xenolinux-2.4.25-sparse/include/linux/sched.h
diff --git a/xenolinux-2.4.25-sparse/Documentation/Configure.help b/xenolinux-2.4.25-sparse/Documentation/Configure.help
index 84676592c8..8fff3cae45 100644
--- a/xenolinux-2.4.25-sparse/Documentation/Configure.help
+++ b/xenolinux-2.4.25-sparse/Documentation/Configure.help
@@ -597,10 +597,10 @@ CONFIG_BLK_DEV_NBD
   If unsure, say N.
 
 XenoLinux virtual block device support
-CONFIG_XENOLINUX_BLOCK
+CONFIG_XEN_VBD
   Xen can export virtual block devices which map back to extents of
   blocks on the physical partitions.  This option is needed for
-  xenolinux to make use of such devices when running as a Xen guest.
+  Linux to make use of such devices when running as a Xen guest.
 
   If unsure, say Y.
 
@@ -17383,11 +17383,11 @@ Acorn partition support
 CONFIG_ACORN_PARTITION
   Support hard disks partitioned under Acorn operating systems.
 
-Xeno partition support
-CONFIG_XENO_PARTITION
-  Support Xeno-style partitions on physical disks.  The Xen
+Xen virtual-partition support
+CONFIG_XEN_VBD_PARTITION
+  Support partition-level virtual block devices.  The Xen
   hypervisor can export partitions on a physical disk to clients,
-  but access to the partition table requires special hackery.
+  but access to the partition table requires special trickery.
   This will be used if this option is enabled; otherwise, 
   it will be possible to access exported partitions by sector
   number but not with useful names e.g. /dev/hda4.
diff --git a/xenolinux-2.4.25-sparse/Makefile b/xenolinux-2.4.25-sparse/Makefile
index b6ccfb4d95..23c647e495 100644
--- a/xenolinux-2.4.25-sparse/Makefile
+++ b/xenolinux-2.4.25-sparse/Makefile
@@ -10,6 +10,7 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 # This will be overriden for Xen and UML builds.
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 ARCH ?= $(SUBARCH)
+ARCH := $(ARCH:xeno=xen) ## Temporary hack while users adjust to new archname
 
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
 
diff --git a/xenolinux-2.4.25-sparse/arch/xen/Makefile b/xenolinux-2.4.25-sparse/arch/xen/Makefile
new file mode 100644
index 0000000000..04117a9e4b
--- /dev/null
+++ b/xenolinux-2.4.25-sparse/arch/xen/Makefile
@@ -0,0 +1,120 @@
+#
+# xen/Makefile
+#
+# This file is included by the global makefile so that you can add your own
+# architecture-specific flags and dependencies. Remember to do have actions
+# for "archclean" and "archdep" for cleaning up and making dependencies for
+# this architecture
+#
+# This file is subject to the terms and conditions of the GNU General Public
+# License.  See the file "COPYING" in the main directory of this archive
+# for more details.
+#
+# Copyright (C) 1994 by Linus Torvalds
+#
+# 19990713  Artur Skawina <skawina@geocities.com>
+#           Added '-march' and '-mpreferred-stack-boundary' support
+#
+
+override EXTRAVERSION := -xen$(EXTRAVERSION)
+
+LD=$(CROSS_COMPILE)ld -m elf_i386
+OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
+LDFLAGS=-e stext
+LINKFLAGS =-T $(TOPDIR)/arch/xen/vmlinux.lds $(LDFLAGS)
+
+CFLAGS += -pipe
+
+check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
+
+# prevent gcc from keeping the stack 16 byte aligned
+CFLAGS += $(call check_gcc,-mpreferred-stack-boundary=2,)
+
+ifdef CONFIG_M686
+CFLAGS += -march=i686
+endif
+
+ifdef CONFIG_MPENTIUMIII
+CFLAGS += -march=i686
+endif
+
+ifdef CONFIG_MPENTIUM4
+CFLAGS += -march=i686
+endif
+
+ifdef CONFIG_MK7
+CFLAGS += $(call check_gcc,-march=athlon,-march=i686 -malign-functions=4)
+endif
+
+HEAD := arch/xen/kernel/head.o arch/xen/kernel/init_task.o
+
+SUBDIRS += arch/xen/kernel arch/xen/mm arch/xen/lib
+SUBDIRS += arch/xen/drivers/console arch/xen/drivers/network
+SUBDIRS += arch/xen/drivers/evtchn arch/xen/drivers/block
+SUBDIRS += arch/xen/drivers/balloon arch/xen/drivers/vnetif
+ifdef CONFIG_XEN_PRIVILEGED_GUEST
+SUBDIRS += arch/xen/drivers/dom0 
+endif
+
+CORE_FILES += arch/xen/kernel/kernel.o arch/xen/mm/mm.o
+CORE_FILES += arch/xen/drivers/evtchn/drv.o
+CORE_FILES += arch/xen/drivers/console/drv.o
+CORE_FILES += arch/xen/drivers/block/drv.o
+CORE_FILES += arch/xen/drivers/network/drv.o
+CORE_FILES += arch/xen/drivers/vnetif/drv.o
+ifdef CONFIG_XEN_PRIVILEGED_GUEST
+CORE_FILES += arch/xen/drivers/dom0/drv.o
+endif
+CORE_FILES += arch/xen/drivers/balloon/drv.o
+LIBS := $(TOPDIR)/arch/xen/lib/lib.a $(LIBS) $(TOPDIR)/arch/xen/lib/lib.a
+
+arch/xen/kernel: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=arch/xen/kernel
+
+arch/xen/mm: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=arch/xen/mm
+
+arch/xen/drivers/console: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=arch/xen/drivers/console
+
+arch/xen/drivers/network: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=arch/xen/drivers/network
+
+arch/xen/drivers/block: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=arch/xen/drivers/block
+
+arch/xen/drivers/dom0: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=arch/xen/drivers/dom0
+
+arch/xen/drivers/balloon: dummy
+	$(MAKE) linuxsubdirs SUBDIRS=arch/xen/drivers/balloon
+
+MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
+
+vmlinux: arch/xen/vmlinux.lds
+
+FORCE: ;
+
+.PHONY: bzImage compressed clean archclean archmrproper archdep
+
+bzImage: vmlinux
+	@$(MAKEBOOT) xenolinux.gz
+
+install: bzImage
+	mkdir -p $(prefix)/boot
+	install -m0644 arch/$(ARCH)/boot/xenolinux.gz $(prefix)/boot/xenolinux.gz
+
+dist: bzImage
+	mkdir -p ../install/boot
+	install -m0644 arch/$(ARCH)/boot/xenolinux.gz ../install/boot/xenolinux.gz
+
+archclean:
+	@$(MAKEBOOT) clean
+
+archmrproper:
+	rm -f include/asm-xen/hypervisor-ifs/arch
+
+archdep:
+	rm -f include/asm-xen/hypervisor-ifs/arch
+	( cd include/asm-xen/hypervisor-ifs ; rm -rf arch ; ln -sf arch-$(SUBARCH) arch)
+	@$(MAKEBOOT) dep
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile b/xenolinux-2.4.25-sparse/arch/xen/boot/Makefile
index 0cd954ea7a..01fb131959 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/boot/Makefile
@@ -1,5 +1,5 @@
 #
-# arch/xeno/boot/Makefile
+# arch/xen/boot/Makefile
 #
 
 xenolinux.gz: xenolinux
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/config.in b/xenolinux-2.4.25-sparse/arch/xen/config.in
index 209bbe6d51..ebfc77aea9 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/config.in
+++ b/xenolinux-2.4.25-sparse/arch/xen/config.in
@@ -4,7 +4,7 @@
 #
 mainmenu_name "Linux Kernel Configuration"
 
-define_bool CONFIG_XENO y
+define_bool CONFIG_XEN y
 
 define_bool CONFIG_X86 y
 define_bool CONFIG_ISA y
@@ -14,7 +14,7 @@ define_bool CONFIG_UID16 y
 
 mainmenu_option next_comment
 comment 'Xenolinux'
-bool 'Support for privileged operations (domain 0)' CONFIG_XENO_PRIV
+bool 'Support for privileged operations (domain 0)' CONFIG_XEN_PRIVILEGED_GUEST
 endmenu
 # The IBM S/390 patch needs this.
 define_bool CONFIG_NO_IDLE_HZ y
@@ -147,7 +147,7 @@ if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
 fi
 dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM
 bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS
-bool 'XenoLinux virtual block device support' CONFIG_XENOLINUX_BLOCK
+bool 'XenoLinux virtual block device support' CONFIG_XEN_VBD
 #endmenu
 define_bool CONFIG_BLK_DEV_HD n
 endmenu
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/defconfig b/xenolinux-2.4.25-sparse/arch/xen/defconfig
index b7bedbcf3d..7b1d1b1ec8 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/defconfig
+++ b/xenolinux-2.4.25-sparse/arch/xen/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
-CONFIG_XENO=y
+CONFIG_XEN=y
 CONFIG_X86=y
 CONFIG_ISA=y
 # CONFIG_SBUS is not set
@@ -11,7 +11,7 @@ CONFIG_UID16=y
 # Xenolinux options
 #
 # support for privileged domains
-CONFIG_XENO_PRIV=y
+CONFIG_XEN_PRIVILEGED_GUEST=y
 # on-demand timer setting (taken from s390 patch set)
 CONFIG_NO_IDLE_HZ=y
 
@@ -168,7 +168,7 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_STATS is not set
-CONFIG_XENOLINUX_BLOCK=y
+CONFIG_XEN_VBD=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/Makefile b/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/Makefile
index 9fb2227978..9fb2227978 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/balloon.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/balloon.c
index b7e6802077..aee0e4cf99 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/balloon.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/balloon.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  * balloon.c
  *
- * Xeno balloon driver - enables returning/claiming memory to/from xen
+ * Xen balloon driver - enables returning/claiming memory to/from Xen.
  *
  * Copyright (c) 2003, B Dragovic
  */
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
-#include <asm/xeno_proc.h>
+#include <asm/xen_proc.h>
 
 #include <linux/mm.h>
 #include <linux/mman.h>
@@ -103,7 +103,7 @@ static unsigned long inflate_balloon(unsigned long num_pages)
         currp++;
     }
 
-    XENO_flush_page_update_queue();
+    XEN_flush_page_update_queue();
 
     dom_mem_op.op = MEMOP_RESERVATION_DECREASE;
     dom_mem_op.u.decrease.size  = num_pages;
@@ -251,11 +251,11 @@ static int balloon_write(struct file *file, const char *buffer,
  */
 static int __init init_module(void)
 {
-    printk(KERN_ALERT "Starting Xeno Balloon driver\n");
+    printk(KERN_ALERT "Starting Xen Balloon driver\n");
 
     credit = 0;
 
-    balloon_pde = create_xeno_proc_entry("balloon", 0600);
+    balloon_pde = create_xen_proc_entry("balloon", 0600);
     if ( balloon_pde == NULL )
     {
         printk(KERN_ALERT "Unable to create balloon driver proc entry!");
@@ -271,7 +271,7 @@ static void __exit cleanup_module(void)
 {
     if ( balloon_pde != NULL )
     {
-        remove_xeno_proc_entry("balloon");
+        remove_xen_proc_entry("balloon");
         balloon_pde = NULL;
     }
 }
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/Makefile b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/Makefile
index 35986ca54a..35986ca54a 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/block.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.c
index c01a44d8f1..1297fe1a03 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/block.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.c
@@ -82,7 +82,7 @@ static void xlblk_update_int(int irq, void *dev_id, struct pt_regs *ptregs)
 }
 
 
-int xenolinux_block_open(struct inode *inode, struct file *filep)
+int xen_block_open(struct inode *inode, struct file *filep)
 {
     short xldev = inode->i_rdev; 
     struct gendisk *gd = get_gendisk(xldev);
@@ -123,7 +123,7 @@ int xenolinux_block_open(struct inode *inode, struct file *filep)
 }
 
 
-int xenolinux_block_release(struct inode *inode, struct file *filep)
+int xen_block_release(struct inode *inode, struct file *filep)
 {
     xl_disk_t *disk = xldev_to_xldisk(inode->i_rdev);
 
@@ -141,7 +141,7 @@ int xenolinux_block_release(struct inode *inode, struct file *filep)
 }
 
 
-int xenolinux_block_ioctl(struct inode *inode, struct file *filep,
+int xen_block_ioctl(struct inode *inode, struct file *filep,
                           unsigned command, unsigned long argument)
 {
     kdev_t dev = inode->i_rdev;
@@ -171,7 +171,7 @@ int xenolinux_block_ioctl(struct inode *inode, struct file *filep,
 
     case BLKRRPART:                               /* re-read partition table */
         DPRINTK_IOCTL("   BLKRRPART: %x\n", BLKRRPART);
-        return xenolinux_block_revalidate(dev);
+        return xen_block_revalidate(dev);
 
     case BLKSSZGET:
         return hardsect_size[MAJOR(dev)][MINOR(dev)]; 
@@ -231,13 +231,13 @@ int xenolinux_block_ioctl(struct inode *inode, struct file *filep,
 }
 
 /* check media change: should probably do something here in some cases :-) */
-int xenolinux_block_check(kdev_t dev)
+int xen_block_check(kdev_t dev)
 {
-    DPRINTK("xenolinux_block_check\n");
+    DPRINTK("xen_block_check\n");
     return 0;
 }
 
-int xenolinux_block_revalidate(kdev_t dev)
+int xen_block_revalidate(kdev_t dev)
 {
     struct block_device *bd;
     struct gendisk *gd;
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/block.h b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.h
index ef8c241387..e41e03970e 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/block.h
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.h
@@ -4,8 +4,8 @@
  * Shared definitions between all levels of XenoLinux Virtual block devices.
  */
 
-#ifndef __XENO_DRIVERS_BLOCK_H__
-#define __XENO_DRIVERS_BLOCK_H__
+#ifndef __XEN_DRIVERS_BLOCK_H__
+#define __XEN_DRIVERS_BLOCK_H__
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -40,7 +40,7 @@
 #endif
 
 /* Private gendisk->flags[] values. */
-#define GENHD_FL_XENO        2 /* Is unit a Xen block device?  */
+#define GENHD_FL_XEN        2 /* Is unit a Xen block device?  */
 #define GENHD_FL_VIRT_PARTNS 4 /* Are unit partitions virtual? */
 
 /*
@@ -52,13 +52,13 @@ typedef struct xl_disk {
     int usage;
 } xl_disk_t;
 
-extern int xenolinux_control_msg(int operration, char *buffer, int size);
-extern int xenolinux_block_open(struct inode *inode, struct file *filep);
-extern int xenolinux_block_release(struct inode *inode, struct file *filep);
-extern int xenolinux_block_ioctl(struct inode *inode, struct file *filep,
+extern int xen_control_msg(int operration, char *buffer, int size);
+extern int xen_block_open(struct inode *inode, struct file *filep);
+extern int xen_block_release(struct inode *inode, struct file *filep);
+extern int xen_block_ioctl(struct inode *inode, struct file *filep,
                                  unsigned command, unsigned long argument);
-extern int xenolinux_block_check(kdev_t dev);
-extern int xenolinux_block_revalidate(kdev_t dev);
+extern int xen_block_check(kdev_t dev);
+extern int xen_block_revalidate(kdev_t dev);
 extern void do_xlblk_request (request_queue_t *rq); 
 
 extern void xlvbd_update_vbds(void);
@@ -79,4 +79,4 @@ static inline xl_disk_t *xldev_to_xldisk(kdev_t xldev)
 extern int  xlvbd_init(void);
 extern void xlvbd_cleanup(void); 
 
-#endif /* __XENO_DRIVERS_BLOCK_H__ */
+#endif /* __XEN_DRIVERS_BLOCK_H__ */
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/vbd.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/vbd.c
index e3473dab28..e08b976c56 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/vbd.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/block/vbd.c
@@ -50,11 +50,11 @@ static xen_disk_t *vbd_info;
 
 static struct block_device_operations xlvbd_block_fops = 
 {
-    open:               xenolinux_block_open,
-    release:            xenolinux_block_release,
-    ioctl:              xenolinux_block_ioctl,
-    check_media_change: xenolinux_block_check,
-    revalidate:         xenolinux_block_revalidate,
+    open:               xen_block_open,
+    release:            xen_block_release,
+    ioctl:              xen_block_ioctl,
+    check_media_change: xen_block_check,
+    revalidate:         xen_block_revalidate,
 };
 
 static int xlvbd_get_vbd_info(xen_disk_t *disk_info)
@@ -246,7 +246,7 @@ static int xlvbd_init_device(xen_disk_t *xd)
     if ( XD_READONLY(xd->info) )
         set_device_ro(device, 1); 
 
-    gd->flags[minor >> gd->minor_shift] |= GENHD_FL_XENO;
+    gd->flags[minor >> gd->minor_shift] |= GENHD_FL_XEN;
 
     /* NB. Linux 2.4 only handles 32-bit sector offsets and capacities. */
     capacity = (unsigned long)xd->capacity;
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/Makefile b/xenolinux-2.4.25-sparse/arch/xen/drivers/console/Makefile
index aaa546a8f3..aaa546a8f3 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/console/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/console/console.c
index bd9a546980..f4d97a65ba 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/console/console.c
@@ -30,9 +30,9 @@
 #include <asm/hypervisor-ifs/event_channel.h>
 #include <asm/control_if.h>
 
-static spinlock_t xeno_console_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t xen_console_lock = SPIN_LOCK_UNLOCKED;
 
-#define XENO_TTY_MINOR 123
+#define XEN_TTY_MINOR 123
 
 /******************** Kernel console driver ********************************/
 
@@ -91,12 +91,12 @@ static void xen_console_write(struct console *co, const char *s,
                               unsigned int count)
 {
     unsigned long flags;
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
     if ( !(start_info.flags & SIF_INITDOMAIN) )
         nonpriv_conwrite(s, count);
     else
         priv_conwrite(s, count);
-    spin_unlock_irqrestore(&xeno_console_lock, flags);
+    spin_unlock_irqrestore(&xen_console_lock, flags);
 }
 
 static kdev_t xen_console_device(struct console *c)
@@ -105,7 +105,7 @@ static kdev_t xen_console_device(struct console *c)
      * This is the magic that binds our "struct console" to our
      * "tty_struct", defined below.
      */
-    return MKDEV(TTY_MAJOR, XENO_TTY_MINOR);
+    return MKDEV(TTY_MAJOR, XEN_TTY_MINOR);
 }
 
 static struct console xen_console_info = {
@@ -145,12 +145,12 @@ asmlinkage int xprintk(const char *fmt, ...)
 
 /******************** User-space console driver (/dev/console) ************/
 
-static struct tty_driver xeno_console_driver;
-static int xeno_console_refcount;
-static struct tty_struct *xeno_console_table[1];
-static struct termios *xeno_console_termios[1];
-static struct termios *xeno_console_termios_locked[1];
-static struct tty_struct *xeno_console_tty;
+static struct tty_driver xen_console_driver;
+static int xen_console_refcount;
+static struct tty_struct *xen_console_table[1];
+static struct termios *xen_console_termios[1];
+static struct termios *xen_console_termios_locked[1];
+static struct tty_struct *xen_console_tty;
 
 #define WBUF_SIZE     1024
 #define WBUF_MASK(_i) ((_i)&(WBUF_SIZE-1))
@@ -166,7 +166,7 @@ static void __do_console_io(void)
     int              i, l, work_done = 0;
     static char      rbuf[16];
 
-    if ( xeno_console_tty == NULL )
+    if ( xen_console_tty == NULL )
         return;
 
     /* Special-case I/O handling for domain 0. */
@@ -175,9 +175,9 @@ static void __do_console_io(void)
         /* Receive work. */
         while ( (l = HYPERVISOR_console_io(CONSOLEIO_read, 16, rbuf)) > 0 )
             for ( i = 0; i < l; i++ )
-                tty_insert_flip_char(xeno_console_tty, rbuf[i], 0);
-        if ( xeno_console_tty->flip.count != 0 )
-            tty_flip_buffer_push(xeno_console_tty);
+                tty_insert_flip_char(xen_console_tty, rbuf[i], 0);
+        if ( xen_console_tty->flip.count != 0 )
+            tty_flip_buffer_push(xen_console_tty);
 
         /* Transmit work. */
         while ( wc != wp )
@@ -187,10 +187,10 @@ static void __do_console_io(void)
                 l = WBUF_SIZE - WBUF_MASK(wc);
             priv_conwrite(&wbuf[WBUF_MASK(wc)], l);
             wc += l;
-            wake_up_interruptible(&xeno_console_tty->write_wait);
-            if ( (xeno_console_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-                 (xeno_console_tty->ldisc.write_wakeup != NULL) )
-                (xeno_console_tty->ldisc.write_wakeup)(xeno_console_tty);
+            wake_up_interruptible(&xen_console_tty->write_wait);
+            if ( (xen_console_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+                 (xen_console_tty->ldisc.write_wakeup != NULL) )
+                (xen_console_tty->ldisc.write_wakeup)(xen_console_tty);
         }
 
         return;
@@ -209,7 +209,7 @@ static void __do_console_io(void)
              (msg->subtype == CMSG_CONSOLE_DATA) )
         {
             for ( i = 0; i < msg->length; i++ )
-                tty_insert_flip_char(xeno_console_tty, msg->msg[i], 0);
+                tty_insert_flip_char(xen_console_tty, msg->msg[i], 0);
         }
         msg->length = 0;
     }
@@ -217,7 +217,7 @@ static void __do_console_io(void)
     {
         ctrl_if->rx_resp_prod = c;
         work_done = 1;
-        tty_flip_buffer_push(xeno_console_tty);
+        tty_flip_buffer_push(xen_console_tty);
     }
     
     /* Transmit work. */
@@ -246,10 +246,10 @@ static void __do_console_io(void)
         ctrl_if->tx_req_prod = c;
         work_done = 1;
         /* There might be something for waiters to do. */
-        wake_up_interruptible(&xeno_console_tty->write_wait);
-        if ( (xeno_console_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-             (xeno_console_tty->ldisc.write_wakeup != NULL) )
-            (xeno_console_tty->ldisc.write_wakeup)(xeno_console_tty);
+        wake_up_interruptible(&xen_console_tty->write_wait);
+        if ( (xen_console_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+             (xen_console_tty->ldisc.write_wakeup != NULL) )
+            (xen_console_tty->ldisc.write_wakeup)(xen_console_tty);
     }
 
     if ( work_done )
@@ -265,65 +265,65 @@ static void __do_console_io(void)
 static void control_event(unsigned int port)
 {
     unsigned long flags;
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
     __do_console_io();
-    spin_unlock_irqrestore(&xeno_console_lock, flags);
+    spin_unlock_irqrestore(&xen_console_lock, flags);
 }
 
 /* This is the callback entry point for domain 0. */
 static void control_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
     unsigned long flags;
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
     __do_console_io();
-    spin_unlock_irqrestore(&xeno_console_lock, flags);    
+    spin_unlock_irqrestore(&xen_console_lock, flags);    
 }
 
-static int xeno_console_write_room(struct tty_struct *tty)
+static int xen_console_write_room(struct tty_struct *tty)
 {
     return WBUF_SIZE - (wp - wc);
 }
 
-static int xeno_console_chars_in_buffer(struct tty_struct *tty)
+static int xen_console_chars_in_buffer(struct tty_struct *tty)
 {
     return wp - wc;
 }
 
-static void xeno_console_send_xchar(struct tty_struct *tty, char ch)
+static void xen_console_send_xchar(struct tty_struct *tty, char ch)
 {
     unsigned long flags;
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
     x_char = ch;
     __do_console_io();
-    spin_unlock_irqrestore(&xeno_console_lock, flags);
+    spin_unlock_irqrestore(&xen_console_lock, flags);
 }
 
-static void xeno_console_throttle(struct tty_struct *tty)
+static void xen_console_throttle(struct tty_struct *tty)
 {
     if ( I_IXOFF(tty) )
-        xeno_console_send_xchar(tty, STOP_CHAR(tty));
+        xen_console_send_xchar(tty, STOP_CHAR(tty));
 }
 
-static void xeno_console_unthrottle(struct tty_struct *tty)
+static void xen_console_unthrottle(struct tty_struct *tty)
 {
     if ( I_IXOFF(tty) )
     {
         if ( x_char != 0 )
             x_char = 0;
         else
-            xeno_console_send_xchar(tty, START_CHAR(tty));
+            xen_console_send_xchar(tty, START_CHAR(tty));
     }
 }
 
-static void xeno_console_flush_buffer(struct tty_struct *tty)
+static void xen_console_flush_buffer(struct tty_struct *tty)
 {
     unsigned long flags;
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
     wc = wp = 0;
-    spin_unlock_irqrestore(&xeno_console_lock, flags);
+    spin_unlock_irqrestore(&xen_console_lock, flags);
 }
 
-static inline int __xeno_console_put_char(int ch)
+static inline int __xen_console_put_char(int ch)
 {
     char _ch = (char)ch;
     if ( (wp - wc) == WBUF_SIZE )
@@ -332,7 +332,7 @@ static inline int __xeno_console_put_char(int ch)
     return 1;
 }
 
-static int xeno_console_write(struct tty_struct *tty, int from_user,
+static int xen_console_write(struct tty_struct *tty, int from_user,
                        const u_char * buf, int count)
 {
     int i;
@@ -341,7 +341,7 @@ static int xeno_console_write(struct tty_struct *tty, int from_user,
     if ( from_user && verify_area(VERIFY_READ, buf, count) )
         return -EINVAL;
 
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
 
     for ( i = 0; i < count; i++ )
     {
@@ -350,35 +350,35 @@ static int xeno_console_write(struct tty_struct *tty, int from_user,
             __get_user(ch, buf + i);
         else
             ch = buf[i];
-        if ( !__xeno_console_put_char(ch) )
+        if ( !__xen_console_put_char(ch) )
             break;
     }
 
     if ( i != 0 )
         __do_console_io();
 
-    spin_unlock_irqrestore(&xeno_console_lock, flags);
+    spin_unlock_irqrestore(&xen_console_lock, flags);
 
     return i;
 }
 
-static void xeno_console_put_char(struct tty_struct *tty, u_char ch)
+static void xen_console_put_char(struct tty_struct *tty, u_char ch)
 {
     unsigned long flags;
-    spin_lock_irqsave(&xeno_console_lock, flags);
-    (void)__xeno_console_put_char(ch);
-    spin_unlock_irqrestore(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
+    (void)__xen_console_put_char(ch);
+    spin_unlock_irqrestore(&xen_console_lock, flags);
 }
 
-static void xeno_console_flush_chars(struct tty_struct *tty)
+static void xen_console_flush_chars(struct tty_struct *tty)
 {
     unsigned long flags;
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
     __do_console_io();
-    spin_unlock_irqrestore(&xeno_console_lock, flags);    
+    spin_unlock_irqrestore(&xen_console_lock, flags);    
 }
 
-static void xeno_console_wait_until_sent(struct tty_struct *tty, int timeout)
+static void xen_console_wait_until_sent(struct tty_struct *tty, int timeout)
 {
     unsigned long orig_jiffies = jiffies;
 
@@ -395,7 +395,7 @@ static void xeno_console_wait_until_sent(struct tty_struct *tty, int timeout)
     set_current_state(TASK_RUNNING);
 }
 
-static int xeno_console_open(struct tty_struct *tty, struct file *filp)
+static int xen_console_open(struct tty_struct *tty, struct file *filp)
 {
     int line;
     unsigned long flags;
@@ -408,17 +408,17 @@ static int xeno_console_open(struct tty_struct *tty, struct file *filp)
         return -ENODEV;
     }
 
-    spin_lock_irqsave(&xeno_console_lock, flags);
+    spin_lock_irqsave(&xen_console_lock, flags);
     tty->driver_data = NULL;
-    if ( xeno_console_tty == NULL )
-        xeno_console_tty = tty;
+    if ( xen_console_tty == NULL )
+        xen_console_tty = tty;
     __do_console_io();
-    spin_unlock_irqrestore(&xeno_console_lock, flags);    
+    spin_unlock_irqrestore(&xen_console_lock, flags);    
 
     return 0;
 }
 
-static void xeno_console_close(struct tty_struct *tty, struct file *filp)
+static void xen_console_close(struct tty_struct *tty, struct file *filp)
 {
     unsigned long flags;
 
@@ -431,47 +431,47 @@ static void xeno_console_close(struct tty_struct *tty, struct file *filp)
         if ( tty->ldisc.flush_buffer != NULL )
             tty->ldisc.flush_buffer(tty);
         tty->closing = 0;
-        spin_lock_irqsave(&xeno_console_lock, flags);
-        xeno_console_tty = NULL;
-        spin_unlock_irqrestore(&xeno_console_lock, flags);    
+        spin_lock_irqsave(&xen_console_lock, flags);
+        xen_console_tty = NULL;
+        spin_unlock_irqrestore(&xen_console_lock, flags);    
     }
 
     MOD_DEC_USE_COUNT;
 }
 
-int __init xeno_con_init(void)
+int __init xen_con_init(void)
 {
-    memset(&xeno_console_driver, 0, sizeof(struct tty_driver));
-    xeno_console_driver.magic           = TTY_DRIVER_MAGIC;
-    xeno_console_driver.name            = "xencons";
-    xeno_console_driver.major           = TTY_MAJOR;
-    xeno_console_driver.minor_start     = XENO_TTY_MINOR;
-    xeno_console_driver.num             = 1;
-    xeno_console_driver.type            = TTY_DRIVER_TYPE_SERIAL;
-    xeno_console_driver.subtype         = SERIAL_TYPE_NORMAL;
-    xeno_console_driver.init_termios    = tty_std_termios;
-    xeno_console_driver.flags           = 
+    memset(&xen_console_driver, 0, sizeof(struct tty_driver));
+    xen_console_driver.magic           = TTY_DRIVER_MAGIC;
+    xen_console_driver.name            = "xencons";
+    xen_console_driver.major           = TTY_MAJOR;
+    xen_console_driver.minor_start     = XEN_TTY_MINOR;
+    xen_console_driver.num             = 1;
+    xen_console_driver.type            = TTY_DRIVER_TYPE_SERIAL;
+    xen_console_driver.subtype         = SERIAL_TYPE_NORMAL;
+    xen_console_driver.init_termios    = tty_std_termios;
+    xen_console_driver.flags           = 
         TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_NO_DEVFS;
-    xeno_console_driver.refcount        = &xeno_console_refcount;
-    xeno_console_driver.table           = xeno_console_table;
-    xeno_console_driver.termios         = xeno_console_termios;
-    xeno_console_driver.termios_locked  = xeno_console_termios_locked;
-
-    xeno_console_driver.open            = xeno_console_open;
-    xeno_console_driver.close           = xeno_console_close;
-    xeno_console_driver.write           = xeno_console_write;
-    xeno_console_driver.write_room      = xeno_console_write_room;
-    xeno_console_driver.put_char        = xeno_console_put_char;
-    xeno_console_driver.flush_chars     = xeno_console_flush_chars;
-    xeno_console_driver.chars_in_buffer = xeno_console_chars_in_buffer;
-    xeno_console_driver.send_xchar      = xeno_console_send_xchar;
-    xeno_console_driver.flush_buffer    = xeno_console_flush_buffer;
-    xeno_console_driver.throttle        = xeno_console_throttle;
-    xeno_console_driver.unthrottle      = xeno_console_unthrottle;
-    xeno_console_driver.wait_until_sent = xeno_console_wait_until_sent;
-
-    if ( tty_register_driver(&xeno_console_driver) )
-        panic("Couldn't register Xeno console driver\n");
+    xen_console_driver.refcount        = &xen_console_refcount;
+    xen_console_driver.table           = xen_console_table;
+    xen_console_driver.termios         = xen_console_termios;
+    xen_console_driver.termios_locked  = xen_console_termios_locked;
+
+    xen_console_driver.open            = xen_console_open;
+    xen_console_driver.close           = xen_console_close;
+    xen_console_driver.write           = xen_console_write;
+    xen_console_driver.write_room      = xen_console_write_room;
+    xen_console_driver.put_char        = xen_console_put_char;
+    xen_console_driver.flush_chars     = xen_console_flush_chars;
+    xen_console_driver.chars_in_buffer = xen_console_chars_in_buffer;
+    xen_console_driver.send_xchar      = xen_console_send_xchar;
+    xen_console_driver.flush_buffer    = xen_console_flush_buffer;
+    xen_console_driver.throttle        = xen_console_throttle;
+    xen_console_driver.unthrottle      = xen_console_unthrottle;
+    xen_console_driver.wait_until_sent = xen_console_wait_until_sent;
+
+    if ( tty_register_driver(&xen_console_driver) )
+        panic("Couldn't register Xen virtual console driver\n");
 
     if ( !(start_info.flags & SIF_INITDOMAIN) )
     {
@@ -486,23 +486,23 @@ int __init xeno_con_init(void)
         control_irq(0, NULL, NULL); /* kickstart the console */
     }
 
-    printk("Xeno console successfully installed\n");
+    printk("Xen virtual console successfully installed\n");
     
     return 0;
 }
 
-void __exit xeno_con_fini(void)
+void __exit xen_con_fini(void)
 {
     int ret;
 
-    ret = tty_unregister_driver(&xeno_console_driver);
+    ret = tty_unregister_driver(&xen_console_driver);
     if ( ret != 0 )
-        printk(KERN_ERR "Unable to unregister Xeno console driver: %d\n", ret);
+        printk(KERN_ERR "Unable to unregister Xen console driver: %d\n", ret);
 
     if ( !(start_info.flags & SIF_INITDOMAIN) )
         (void)evtchn_free_port(0);
 }
 
-module_init(xeno_con_init);
-module_exit(xeno_con_fini);
+module_init(xen_con_init);
+module_exit(xen_con_fini);
 
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/Makefile b/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/Makefile
index 3e2e17bd23..3e2e17bd23 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/core.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/core.c
index c7f1fd496b..b59f3e8a84 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/core.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/core.c
@@ -29,7 +29,7 @@
 #include <asm/tlb.h>
 #include <asm/proc_cmd.h>
 #include <asm/hypervisor-ifs/dom0_ops.h>
-#include <asm/xeno_proc.h>
+#include <asm/xen_proc.h>
 
 static struct proc_dir_entry *privcmd_intf;
 
@@ -80,7 +80,7 @@ static int __init init_module(void)
     if ( !(start_info.flags & SIF_PRIVILEGED) )
         return 0;
 
-    privcmd_intf = create_xeno_proc_entry("privcmd", 0400);
+    privcmd_intf = create_xen_proc_entry("privcmd", 0400);
     if ( privcmd_intf != NULL )
     {
         privcmd_intf->owner      = THIS_MODULE;
@@ -95,7 +95,7 @@ static int __init init_module(void)
 static void __exit cleanup_module(void)
 {
     if ( privcmd_intf == NULL ) return;
-    remove_xeno_proc_entry("privcmd");
+    remove_xen_proc_entry("privcmd");
     privcmd_intf = NULL;
 }
 
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/vfr.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/vfr.c
index 56b491314b..9d8ca0a32d 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/vfr.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/vfr.c
@@ -12,7 +12,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
-#include <asm/xeno_proc.h>
+#include <asm/xen_proc.h>
 #include <asm/hypervisor-ifs/network.h>
 
 static struct proc_dir_entry *proc_vfr;
@@ -229,7 +229,7 @@ static int __init init_module(void)
         return 0;
 
     *readbuf = '\0';
-    proc_vfr = create_xeno_proc_entry("vfr", 0600);
+    proc_vfr = create_xen_proc_entry("vfr", 0600);
     if ( proc_vfr != NULL )
     {
         proc_vfr->owner      = THIS_MODULE;
@@ -244,7 +244,7 @@ static int __init init_module(void)
 static void __exit cleanup_module(void)
 {
     if ( proc_vfr == NULL ) return;
-    remove_xeno_proc_entry("vfr");
+    remove_xen_proc_entry("vfr");
     proc_vfr = NULL;
 }
 
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/evtchn/Makefile b/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/Makefile
index 61c983f625..61c983f625 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/evtchn/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/evtchn/evtchn.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/evtchn.c
index a7978ee8d2..a7978ee8d2 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/evtchn/evtchn.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/evtchn.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/Makefile b/xenolinux-2.4.25-sparse/arch/xen/drivers/network/Makefile
index 2e4c1f4825..2e4c1f4825 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/network/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/network.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/network/network.c
index c5d25442e2..c5d25442e2 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/network.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/network/network.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/vnetif/Makefile b/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/Makefile
index 304c2e78ef..304c2e78ef 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/vnetif/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/vnetif/vnetif.c b/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/vnetif.c
index 91f3c5c17e..91f3c5c17e 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/vnetif/vnetif.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/vnetif.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/Makefile b/xenolinux-2.4.25-sparse/arch/xen/kernel/Makefile
index 10fc43e742..10fc43e742 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/entry.S b/xenolinux-2.4.25-sparse/arch/xen/kernel/entry.S
index 9b1a77d4c1..9b1a77d4c1 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/entry.S
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/entry.S
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/head.S b/xenolinux-2.4.25-sparse/arch/xen/kernel/head.S
index 361815a58b..361815a58b 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/head.S
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/head.S
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/hypervisor.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/hypervisor.c
index 7c6aca05c5..7c6aca05c5 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/hypervisor.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/hypervisor.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/i386_ksyms.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/i386_ksyms.c
index 6744999039..267516500f 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/i386_ksyms.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/i386_ksyms.c
@@ -167,9 +167,9 @@ EXPORT_SYMBOL(atomic_dec_and_lock);
 EXPORT_SYMBOL(xquad_portio);
 #endif
 
-#include <asm/xeno_proc.h>
-EXPORT_SYMBOL(create_xeno_proc_entry);
-EXPORT_SYMBOL(remove_xeno_proc_entry);
+#include <asm/xen_proc.h>
+EXPORT_SYMBOL(create_xen_proc_entry);
+EXPORT_SYMBOL(remove_xen_proc_entry);
 
 EXPORT_SYMBOL(do_hypervisor_callback);
 EXPORT_SYMBOL(HYPERVISOR_shared_info);
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/ioport.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/ioport.c
index fc0164045f..fc0164045f 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/ioport.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/ioport.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/irq.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/irq.c
index c88e976125..c88e976125 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/irq.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/irq.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/ldt.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/ldt.c
index 6a2bd7a0d9..6a2bd7a0d9 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/ldt.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/ldt.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-dma.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-dma.c
index dd8842719e..dd8842719e 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-dma.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-dma.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-i386.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-i386.c
index 96dcdde6b3..96dcdde6b3 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-i386.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-i386.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-i386.h b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-i386.h
index fe70b10166..fe70b10166 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-i386.h
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-i386.h
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-irq.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-irq.c
index f530244f6a..f530244f6a 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-irq.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-irq.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-pc.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-pc.c
index afe6e4d494..afe6e4d494 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/pci-pc.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-pc.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/physirq.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/physirq.c
index 1f7a8e4fee..1f7a8e4fee 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/physirq.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/physirq.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/process.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/process.c
index 640179661b..640179661b 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/process.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/process.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/setup.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/setup.c
index c593bddec7..c593bddec7 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/setup.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/setup.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/signal.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/signal.c
index f646c5c0ca..f646c5c0ca 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/signal.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/signal.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/time.c
index 574ba786b4..bff0f26b4f 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/time.c
@@ -4,7 +4,7 @@
  * (C) 2002-2003 - Keir Fraser - University of Cambridge
  ****************************************************************************
  *
- *        File: arch/xeno/kernel/time.c
+ *        File: arch/xen/kernel/time.c
  *      Author: Rolf Neugebauer and Keir Fraser
  * 
  * Description: Interface with Xen to get correct notion of time
@@ -85,7 +85,7 @@ static struct timeval shadow_tv;
  */
 static struct timeval last_seen_tv = {0,0};
 
-#ifdef CONFIG_XENO_PRIV
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 /* Periodically propagate synchronised time base to the RTC and to Xen. */
 static long last_update_to_rtc, last_update_to_xen;
 #endif
@@ -126,7 +126,7 @@ static int __init __independent_wallclock(char *str)
 __setup("independent_wallclock", __independent_wallclock);
 
 
-#ifdef CONFIG_XENO_PRIV
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 /*
  * In order to set the CMOS clock precisely, set_rtc_mmss has to be
  * called 500 ms after the second nowtime has started, because when
@@ -332,7 +332,7 @@ void do_settimeofday(struct timeval *tv)
     last_seen_tv.tv_sec = 0;
     last_update_from_xen = 0;
 
-#ifdef CONFIG_XENO_PRIV
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     if ( start_info.flags & SIF_INITDOMAIN )
     {
         dom0_op_t op;
@@ -444,7 +444,7 @@ static inline void do_timer_interrupt(int irq, void *dev_id,
         last_update_from_xen = xtime.tv_sec;
     }
 
-#ifdef CONFIG_XENO_PRIV
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 	if ( (start_info.flags & SIF_INITDOMAIN) &&
          ((time_status & STA_UNSYNC) == 0) )
     {
@@ -634,21 +634,21 @@ void __init time_init(void)
 
 
 /*
- * /proc/sys/xeno: This really belongs in another file. It can stay here for
+ * /proc/sys/xen: This really belongs in another file. It can stay here for
  * now however.
  */
-static ctl_table xeno_subtable[] = {
+static ctl_table xen_subtable[] = {
     {1, "independent_wallclock", &independent_wallclock,
      sizeof(independent_wallclock), 0644, NULL, proc_dointvec},
     {0}
 };
-static ctl_table xeno_table[] = {
-    {123, "xeno", NULL, 0, 0555, xeno_subtable},
+static ctl_table xen_table[] = {
+    {123, "xen", NULL, 0, 0555, xen_subtable},
     {0}
 };
-static int __init xeno_sysctl_init(void)
+static int __init xen_sysctl_init(void)
 {
-    (void)register_sysctl_table(xeno_table, 0);
+    (void)register_sysctl_table(xen_table, 0);
     return 0;
 }
-__initcall(xeno_sysctl_init);
+__initcall(xen_sysctl_init);
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/kernel/traps.c b/xenolinux-2.4.25-sparse/arch/xen/kernel/traps.c
index 63288fc282..63288fc282 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/kernel/traps.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/kernel/traps.c
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/lib/Makefile b/xenolinux-2.4.25-sparse/arch/xen/lib/Makefile
index 3bbf40148e..5e00fdc135 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/lib/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/lib/Makefile
@@ -6,7 +6,7 @@ L_TARGET = lib.a
 
 obj-y = checksum.o old-checksum.o delay.o \
 	usercopy.o getuser.o \
-	memcpy.o strstr.o xeno_proc.o
+	memcpy.o strstr.o xen_proc.o
 
 obj-$(CONFIG_X86_USE_3DNOW) += mmx.o
 obj-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/lib/delay.c b/xenolinux-2.4.25-sparse/arch/xen/lib/delay.c
index 0035bed074..0035bed074 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/lib/delay.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/lib/delay.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/lib/xeno_proc.c b/xenolinux-2.4.25-sparse/arch/xen/lib/xeno_proc.c
new file mode 100644
index 0000000000..9c06dcdd89
--- /dev/null
+++ b/xenolinux-2.4.25-sparse/arch/xen/lib/xeno_proc.c
@@ -0,0 +1,18 @@
+
+#include <linux/config.h>
+#include <linux/proc_fs.h>
+
+static struct proc_dir_entry *xen_base;
+
+struct proc_dir_entry *create_xen_proc_entry(const char *name, mode_t mode)
+{
+    if ( xen_base == NULL )
+        if ( (xen_base = proc_mkdir("xen", &proc_root)) == NULL )
+            panic("Couldn't create /proc/xen");
+    return create_proc_entry(name, mode, xen_base);
+}
+
+void remove_xen_proc_entry(const char *name)
+{
+    remove_proc_entry(name, xen_base);
+}
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/mm/Makefile b/xenolinux-2.4.25-sparse/arch/xen/mm/Makefile
index d0d16114b6..d0d16114b6 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/mm/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xen/mm/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/mm/fault.c b/xenolinux-2.4.25-sparse/arch/xen/mm/fault.c
index d1c34d93d7..496e974487 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/mm/fault.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/mm/fault.c
@@ -316,7 +316,7 @@ vmalloc_fault:
 		if (!pmd_present(*pmd_k))
 			goto no_context;
 		set_pmd(pmd, *pmd_k);
-                XENO_flush_page_update_queue(); /* flush PMD update */
+                XEN_flush_page_update_queue(); /* flush PMD update */
 
 		pte_k = pte_offset(pmd_k, address);
 		if (!pte_present(*pte_k))
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/mm/hypervisor.c b/xenolinux-2.4.25-sparse/arch/xen/mm/hypervisor.c
index 94592d63f1..39f6863d66 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/mm/hypervisor.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/mm/hypervisor.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * xeno/mm/hypervisor.c
+ * xen/mm/hypervisor.c
  * 
  * Update page tables via the hypervisor.
  * 
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/mm/init.c b/xenolinux-2.4.25-sparse/arch/xen/mm/init.c
index c78a84d1c8..0bb2d173e4 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/mm/init.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/mm/init.c
@@ -182,7 +182,7 @@ static void __init fixrange_init (unsigned long start,
         j = 0;
     }
 	
-    XENO_flush_page_update_queue();
+    XEN_flush_page_update_queue();
 }
 
 
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/mm/ioremap.c b/xenolinux-2.4.25-sparse/arch/xen/mm/ioremap.c
index 434e82c971..7b1162de9c 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/mm/ioremap.c
+++ b/xenolinux-2.4.25-sparse/arch/xen/mm/ioremap.c
@@ -1,5 +1,5 @@
 /*
- * arch/xeno/mm/ioremap.c
+ * arch/xen/mm/ioremap.c
  *
  * Re-map IO memory to kernel address space so that we can access it.
  *
@@ -18,7 +18,7 @@
 #include <asm/tlb.h>
 #include <asm/mmu.h>
 
-#if defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
 
 /* These hacky macros avoid phys->machine translations. */
 #define __direct_pte(x) ((pte_t) { (x) } )
@@ -114,7 +114,7 @@ int direct_remap_area_pages(struct mm_struct *mm,
     return error;
 }
 
-#endif /* CONFIG_XENO_PRIV */
+#endif /* CONFIG_XEN_PRIVILEGED_GUEST */
 
 
 /*
@@ -130,7 +130,7 @@ void * __ioremap(unsigned long machine_addr,
                  unsigned long size, 
                  unsigned long flags)
 {
-#if defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
     void * addr;
     struct vm_struct * area;
     unsigned long offset, last_addr;
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/vmlinux.lds b/xenolinux-2.4.25-sparse/arch/xen/vmlinux.lds
index 7c4c4f8e9c..7c4c4f8e9c 100644
--- a/xenolinux-2.4.25-sparse/arch/xeno/vmlinux.lds
+++ b/xenolinux-2.4.25-sparse/arch/xen/vmlinux.lds
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/Makefile
deleted file mode 100644
index a2e6a0e0cd..0000000000
--- a/xenolinux-2.4.25-sparse/arch/xeno/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# xeno/Makefile
-#
-# This file is included by the global makefile so that you can add your own
-# architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 1994 by Linus Torvalds
-#
-# 19990713  Artur Skawina <skawina@geocities.com>
-#           Added '-march' and '-mpreferred-stack-boundary' support
-#
-
-override EXTRAVERSION := -xeno$(EXTRAVERSION)
-
-LD=$(CROSS_COMPILE)ld -m elf_i386
-OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
-LDFLAGS=-e stext
-LINKFLAGS =-T $(TOPDIR)/arch/xeno/vmlinux.lds $(LDFLAGS)
-
-CFLAGS += -pipe
-
-check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
-
-# prevent gcc from keeping the stack 16 byte aligned
-CFLAGS += $(call check_gcc,-mpreferred-stack-boundary=2,)
-
-ifdef CONFIG_M686
-CFLAGS += -march=i686
-endif
-
-ifdef CONFIG_MPENTIUMIII
-CFLAGS += -march=i686
-endif
-
-ifdef CONFIG_MPENTIUM4
-CFLAGS += -march=i686
-endif
-
-ifdef CONFIG_MK7
-CFLAGS += $(call check_gcc,-march=athlon,-march=i686 -malign-functions=4)
-endif
-
-HEAD := arch/xeno/kernel/head.o arch/xeno/kernel/init_task.o
-
-SUBDIRS += arch/xeno/kernel arch/xeno/mm arch/xeno/lib
-SUBDIRS += arch/xeno/drivers/console arch/xeno/drivers/network
-SUBDIRS += arch/xeno/drivers/evtchn arch/xeno/drivers/block
-SUBDIRS += arch/xeno/drivers/balloon arch/xeno/drivers/vnetif
-ifdef CONFIG_XENO_PRIV
-SUBDIRS += arch/xeno/drivers/dom0 
-endif
-
-CORE_FILES += arch/xeno/kernel/kernel.o arch/xeno/mm/mm.o
-CORE_FILES += arch/xeno/drivers/evtchn/drv.o
-CORE_FILES += arch/xeno/drivers/console/drv.o
-CORE_FILES += arch/xeno/drivers/block/drv.o
-CORE_FILES += arch/xeno/drivers/network/drv.o
-CORE_FILES += arch/xeno/drivers/vnetif/drv.o
-ifdef CONFIG_XENO_PRIV
-CORE_FILES += arch/xeno/drivers/dom0/drv.o
-endif
-CORE_FILES += arch/xeno/drivers/balloon/drv.o
-LIBS := $(TOPDIR)/arch/xeno/lib/lib.a $(LIBS) $(TOPDIR)/arch/xeno/lib/lib.a
-
-arch/xeno/kernel: dummy
-	$(MAKE) linuxsubdirs SUBDIRS=arch/xeno/kernel
-
-arch/xeno/mm: dummy
-	$(MAKE) linuxsubdirs SUBDIRS=arch/xeno/mm
-
-arch/xeno/drivers/console: dummy
-	$(MAKE) linuxsubdirs SUBDIRS=arch/xeno/drivers/console
-
-arch/xeno/drivers/network: dummy
-	$(MAKE) linuxsubdirs SUBDIRS=arch/xeno/drivers/network
-
-arch/xeno/drivers/block: dummy
-	$(MAKE) linuxsubdirs SUBDIRS=arch/xeno/drivers/block
-
-arch/xeno/drivers/dom0: dummy
-	$(MAKE) linuxsubdirs SUBDIRS=arch/xeno/drivers/dom0
-
-arch/xeno/drivers/balloon: dummy
-	$(MAKE) linuxsubdirs SUBDIRS=arch/xeno/drivers/balloon
-
-MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
-
-vmlinux: arch/xeno/vmlinux.lds
-
-FORCE: ;
-
-.PHONY: bzImage compressed clean archclean archmrproper archdep
-
-bzImage: vmlinux
-	@$(MAKEBOOT) xenolinux.gz
-
-install: bzImage
-	mkdir -p $(prefix)/boot
-	install -m0644 arch/$(ARCH)/boot/xenolinux.gz $(prefix)/boot/xenolinux.gz
-
-dist: bzImage
-	mkdir -p ../install/boot
-	install -m0644 arch/$(ARCH)/boot/xenolinux.gz ../install/boot/xenolinux.gz
-
-archclean:
-	@$(MAKEBOOT) clean
-
-archmrproper:
-	rm -f include/asm-xeno/hypervisor-ifs/arch
-
-archdep:
-	rm -f include/asm-xeno/hypervisor-ifs/arch
-	( cd include/asm-xeno/hypervisor-ifs ; rm -rf arch ; ln -sf arch-$(SUBARCH) arch)
-	@$(MAKEBOOT) dep
diff --git a/xenolinux-2.4.25-sparse/arch/xeno/lib/xeno_proc.c b/xenolinux-2.4.25-sparse/arch/xeno/lib/xeno_proc.c
deleted file mode 100644
index 2eca39d6aa..0000000000
--- a/xenolinux-2.4.25-sparse/arch/xeno/lib/xeno_proc.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#include <linux/config.h>
-#include <linux/proc_fs.h>
-
-static struct proc_dir_entry *xeno_base;
-
-struct proc_dir_entry *create_xeno_proc_entry(const char *name, mode_t mode)
-{
-    if ( xeno_base == NULL )
-        if ( (xeno_base = proc_mkdir("xen", &proc_root)) == NULL )
-            panic("Couldn't create /proc/xen");
-    return create_proc_entry(name, mode, xeno_base);
-}
-
-void remove_xeno_proc_entry(const char *name)
-{
-    remove_proc_entry(name, xeno_base);
-}
diff --git a/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c b/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c
index 419a050b25..8092d5fe7d 100644
--- a/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c
+++ b/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c
@@ -1557,7 +1557,7 @@ int __init blk_dev_init(void)
 #ifdef CONFIG_BLK_DEV_FD
 	floppy_init();
 #else
-#if defined(__i386__) && !defined(CONFIG_XENO) /* Do we even need this? */
+#if defined(__i386__) && !defined(CONFIG_XEN) /* Do we even need this? */
 	outb_p(0xc, 0x3f2);
 #endif
 #endif
@@ -1617,7 +1617,7 @@ int __init blk_dev_init(void)
 	jsfd_init();
 #endif
 
-#ifdef CONFIG_XENOLINUX_BLOCK
+#ifdef CONFIG_XEN_VBD
     xlblk_init();
 #endif
 
diff --git a/xenolinux-2.4.25-sparse/drivers/char/mem.c b/xenolinux-2.4.25-sparse/drivers/char/mem.c
index 73e6d48713..dbc10d6382 100644
--- a/xenolinux-2.4.25-sparse/drivers/char/mem.c
+++ b/xenolinux-2.4.25-sparse/drivers/char/mem.c
@@ -7,8 +7,8 @@
  *    Jan-11-1998, C. Scott Ananian <cananian@alumni.princeton.edu>
  *  Shared /dev/zero mmaping support, Feb 2000, Kanoj Sarcar <kanoj@sgi.com>
  *
- *  MODIFIED FOR XENOLINUX by Keir Fraser, 10th July 2003.
- *  Xenolinux has strange semantics for /dev/mem and /dev/kmem!!
+ *  MODIFIED FOR XEN by Keir Fraser, 10th July 2003.
+ *  Linux running on Xen has strange semantics for /dev/mem and /dev/kmem!!
  *   1. mmap will not work on /dev/kmem
  *   2. mmap on /dev/mem interprets the 'file offset' as a machine address
  *      rather than a physical address.
@@ -201,18 +201,18 @@ static int mmap_mem(struct file * file, struct vm_area_struct * vma)
 {
 	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
 
-#if defined(CONFIG_XENO) && defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN) && defined(CONFIG_XEN_PRIVILEGED_GUEST)
 	if (!(start_info.flags & SIF_PRIVILEGED))
 		return -ENXIO;
 
-	/* DONTCOPY is essential for Xenolinux as copy_page_range is broken. */
+	/* DONTCOPY is essential for Xen as copy_page_range is broken. */
 	vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY;
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 	if (direct_remap_area_pages(vma->vm_mm, vma->vm_start, offset, 
 			     vma->vm_end-vma->vm_start, vma->vm_page_prot))
 		return -EAGAIN;
 	return 0;
-#elif defined(CONFIG_XENO)
+#elif defined(CONFIG_XEN)
 	return -ENXIO;
 #else
 	/*
@@ -426,7 +426,7 @@ static inline size_t read_zero_pagealigned(char * buf, size_t size)
 			goto out_up;
 		if (vma->vm_flags & VM_SHARED)
 			break;
-#if defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
 		if (vma->vm_flags & VM_IO)
 			break;
 #endif
@@ -615,7 +615,7 @@ static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
 	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
 	unsigned long size = vma->vm_end - vma->vm_start;
 
-#if defined(CONFIG_XENO)
+#if defined(CONFIG_XEN)
 	return -ENXIO;
 #endif
 
@@ -715,8 +715,8 @@ static int memory_open(struct inode * inode, struct file * filp)
 			break;
 #if defined(CONFIG_ISA) || !defined(__mc68000__)
 		case 4:
-#if defined(CONFIG_XENO)
-#if defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN)
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
 			if (!(start_info.flags & SIF_PRIVILEGED))
 #endif
 				return -ENXIO;
diff --git a/xenolinux-2.4.25-sparse/fs/exec.c b/xenolinux-2.4.25-sparse/fs/exec.c
index 2548d1d1f8..16dc3193bf 100644
--- a/xenolinux-2.4.25-sparse/fs/exec.c
+++ b/xenolinux-2.4.25-sparse/fs/exec.c
@@ -311,7 +311,7 @@ void put_dirty_page(struct task_struct * tsk, struct page *page, unsigned long a
 	if (vma)
 		prot = vma->vm_page_prot;
 	set_pte(pte, pte_mkdirty(pte_mkwrite(mk_pte(page, prot))));
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 	tsk->mm->rss++;
 	spin_unlock(&tsk->mm->page_table_lock);
 
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/bugs.h b/xenolinux-2.4.25-sparse/include/asm-xen/bugs.h
index c46b6a0b15..c46b6a0b15 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/bugs.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/bugs.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/control_if.h b/xenolinux-2.4.25-sparse/include/asm-xen/control_if.h
index dd15a96bff..dd15a96bff 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/control_if.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/control_if.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/desc.h b/xenolinux-2.4.25-sparse/include/asm-xen/desc.h
index 33309a9671..33309a9671 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/desc.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/desc.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/evtchn.h b/xenolinux-2.4.25-sparse/include/asm-xen/evtchn.h
index 88c278d86e..88c278d86e 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/evtchn.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/evtchn.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/fixmap.h b/xenolinux-2.4.25-sparse/include/asm-xen/fixmap.h
index 2441b01d4e..2441b01d4e 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/fixmap.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/fixmap.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/highmem.h b/xenolinux-2.4.25-sparse/include/asm-xen/highmem.h
index 7e56b1b32d..7e56b1b32d 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/highmem.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/highmem.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/hw_irq.h b/xenolinux-2.4.25-sparse/include/asm-xen/hw_irq.h
index d99d15bd24..d99d15bd24 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/hw_irq.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/hw_irq.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h b/xenolinux-2.4.25-sparse/include/asm-xen/hypervisor.h
index fe13471aa5..34d0974471 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/hypervisor.h
@@ -16,7 +16,7 @@
 #include <asm/ptrace.h>
 #include <asm/page.h>
 
-/* arch/xeno/kernel/setup.c */
+/* arch/xen/kernel/setup.c */
 union start_info_union
 {
     start_info_t start_info;
@@ -25,11 +25,11 @@ union start_info_union
 extern union start_info_union start_info_union;
 #define start_info (start_info_union.start_info)
 
-/* arch/xeno/kernel/hypervisor.c */
+/* arch/xen/kernel/hypervisor.c */
 void do_hypervisor_callback(struct pt_regs *regs);
 
 
-/* arch/xeno/mm/hypervisor.c */
+/* arch/xen/mm/hypervisor.c */
 /*
  * NB. ptr values should be PHYSICAL, not MACHINE. 'vals' should be already
  * be MACHINE addresses.
@@ -137,7 +137,7 @@ static inline int flush_page_update_queue(void)
     if ( idx != 0 ) _flush_page_update_queue();
     return idx;
 }
-#define XENO_flush_page_update_queue() (_flush_page_update_queue())
+#define XEN_flush_page_update_queue() (_flush_page_update_queue())
 void MULTICALL_flush_page_update_queue(void);
 
 
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/io.h b/xenolinux-2.4.25-sparse/include/asm-xen/io.h
index 3d78e20950..3d78e20950 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/io.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/io.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/irq.h b/xenolinux-2.4.25-sparse/include/asm-xen/irq.h
index 917a05334d..917a05334d 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/irq.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/irq.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/keyboard.h b/xenolinux-2.4.25-sparse/include/asm-xen/keyboard.h
index 82e10faab2..79d72da929 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/keyboard.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/keyboard.h
@@ -1,4 +1,3 @@
-/* xenolinux/include/asm-xeno/keyboard.h */
 /* Portions copyright (c) 2003 James Scott, Intel Research Cambridge */
 /*
  * Talks to hypervisor to get PS/2 keyboard and mouse events, and send keyboard
@@ -11,8 +10,8 @@
  *  Created 3 Nov 1996 by Geert Uytterhoeven
  */
 
-#ifndef _XENO_KEYBOARD_H
-#define _XENO_KEYBOARD_H
+#ifndef _XEN_KEYBOARD_H
+#define _XEN_KEYBOARD_H
 
 #ifdef __KERNEL__
 
@@ -95,4 +94,4 @@ static unsigned char kbd_read_status(void)
 
 
 #endif /* __KERNEL__ */
-#endif /* _XENO_KEYBOARD_H */
+#endif /* _XEN_KEYBOARD_H */
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/mmu_context.h b/xenolinux-2.4.25-sparse/include/asm-xen/mmu_context.h
index 7972ce7d74..7972ce7d74 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/mmu_context.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/mmu_context.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/msr.h b/xenolinux-2.4.25-sparse/include/asm-xen/msr.h
index 1a2c8765a8..1a2c8765a8 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/msr.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/msr.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/multicall.h b/xenolinux-2.4.25-sparse/include/asm-xen/multicall.h
index f0ea5c3a66..f0ea5c3a66 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/multicall.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/multicall.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/page.h b/xenolinux-2.4.25-sparse/include/asm-xen/page.h
index b7640a7d78..b7640a7d78 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/page.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/page.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/pgalloc.h b/xenolinux-2.4.25-sparse/include/asm-xen/pgalloc.h
index 9a90cb1b1d..308a1b7c40 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/pgalloc.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/pgalloc.h
@@ -22,7 +22,7 @@
 #define pmd_populate(mm, pmd, pte) 		  \
  do {                                             \
   set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)));   \
-  XENO_flush_page_update_queue();                 \
+  XEN_flush_page_update_queue();                 \
  } while ( 0 )
 
 /*
@@ -210,21 +210,21 @@ extern int do_check_pgt_cache(int, int);
 static inline void flush_tlb_mm(struct mm_struct *mm)
 {
 	if (mm == current->active_mm) queue_tlb_flush();
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 }
 
 static inline void flush_tlb_page(struct vm_area_struct *vma,
 	unsigned long addr)
 {
 	if (vma->vm_mm == current->active_mm) queue_invlpg(addr);
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 }
 
 static inline void flush_tlb_range(struct mm_struct *mm,
 	unsigned long start, unsigned long end)
 {
 	if (mm == current->active_mm) queue_tlb_flush();
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 }
 
 #else
@@ -262,7 +262,7 @@ static inline void flush_tlb_pgtables(struct mm_struct *mm,
 				      unsigned long start, unsigned long end)
 {
     /* i386 does not keep any page table caches in TLB */
-    XENO_flush_page_update_queue();
+    XEN_flush_page_update_queue();
 }
 
 extern int direct_remap_area_pages(struct mm_struct *mm,
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable-2level.h b/xenolinux-2.4.25-sparse/include/asm-xen/pgtable-2level.h
index c780f644c0..c780f644c0 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable-2level.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/pgtable-2level.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable.h b/xenolinux-2.4.25-sparse/include/asm-xen/pgtable.h
index 07087bdf39..36655e63e5 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/pgtable.h
@@ -38,11 +38,11 @@ extern void paging_init(void);
 
 extern unsigned long pgkern_mask;
 
-#define __flush_tlb() ({ queue_tlb_flush(); XENO_flush_page_update_queue(); })
+#define __flush_tlb() ({ queue_tlb_flush(); XEN_flush_page_update_queue(); })
 #define __flush_tlb_global() __flush_tlb()
 #define __flush_tlb_all() __flush_tlb_global()
-#define __flush_tlb_one(addr) ({ queue_invlpg(addr); XENO_flush_page_update_queue(); })
-#define __flush_tlb_single(addr) ({ queue_invlpg(addr); XENO_flush_page_update_queue(); })
+#define __flush_tlb_one(addr) ({ queue_invlpg(addr); XEN_flush_page_update_queue(); })
+#define __flush_tlb_single(addr) ({ queue_invlpg(addr); XEN_flush_page_update_queue(); })
 
 /*
  * ZERO_PAGE is a global shared page that is always zero: used
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/proc_cmd.h b/xenolinux-2.4.25-sparse/include/asm-xen/proc_cmd.h
index 2fddd2c243..4ce2930daa 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/proc_cmd.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/proc_cmd.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  * proc_cmd.h
  * 
- * Interface to /proc/cmd and /proc/xeno/privcmd.
+ * Interface to /proc/cmd and /proc/xen/privcmd.
  */
 
 #ifndef __PROC_CMD_H__
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/processor.h b/xenolinux-2.4.25-sparse/include/asm-xen/processor.h
index 2b290252be..2b290252be 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/processor.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/processor.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/ptrace.h b/xenolinux-2.4.25-sparse/include/asm-xen/ptrace.h
index 4457ac0b17..4457ac0b17 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/ptrace.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/ptrace.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/segment.h b/xenolinux-2.4.25-sparse/include/asm-xen/segment.h
index ca13028ce0..ca13028ce0 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/segment.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/segment.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/smp.h b/xenolinux-2.4.25-sparse/include/asm-xen/smp.h
index 804b93c332..804b93c332 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/smp.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/smp.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/suspend.h b/xenolinux-2.4.25-sparse/include/asm-xen/suspend.h
index 337290dc95..937137f005 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/suspend.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/suspend.h
@@ -7,8 +7,8 @@
  * Copyright (c) 2003, K A Fraser
  */
 
-#ifndef __ASM_XENO_SUSPEND_H__
-#define __ASM_XENO_SUSPEND_H__
+#ifndef __ASM_XEN_SUSPEND_H__
+#define __ASM_XEN_SUSPEND_H__
 
 typedef struct suspend_record_st {
     /* To be filled in before resume. */
@@ -22,4 +22,4 @@ typedef struct suspend_record_st {
     unsigned long nr_pfns;
 } suspend_record_t;
 
-#endif /* __ASM_XENO_SUSPEND_H__ */
+#endif /* __ASM_XEN_SUSPEND_H__ */
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/system.h b/xenolinux-2.4.25-sparse/include/asm-xen/system.h
index 3b59252ca3..3b59252ca3 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/system.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/system.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/vga.h b/xenolinux-2.4.25-sparse/include/asm-xen/vga.h
index d0624cf480..d0624cf480 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/vga.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/vga.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/xeno_proc.h b/xenolinux-2.4.25-sparse/include/asm-xen/xeno_proc.h
new file mode 100644
index 0000000000..d62791e95c
--- /dev/null
+++ b/xenolinux-2.4.25-sparse/include/asm-xen/xeno_proc.h
@@ -0,0 +1,13 @@
+
+#ifndef __ASM_XEN_PROC_H__
+#define __ASM_XEN_PROC_H__
+
+#include <linux/config.h>
+#include <linux/proc_fs.h>
+
+extern struct proc_dir_entry *create_xen_proc_entry(
+    const char *name, mode_t mode);
+extern void remove_xen_proc_entry(
+    const char *name);
+
+#endif /* __ASM_XEN_PROC_H__ */
diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/xeno_proc.h b/xenolinux-2.4.25-sparse/include/asm-xeno/xeno_proc.h
deleted file mode 100644
index d794b733f5..0000000000
--- a/xenolinux-2.4.25-sparse/include/asm-xeno/xeno_proc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifndef __ASM_XENO_PROC_H__
-#define __ASM_XENO_PROC_H__
-
-#include <linux/config.h>
-#include <linux/proc_fs.h>
-
-extern struct proc_dir_entry *create_xeno_proc_entry(
-    const char *name, mode_t mode);
-extern void remove_xeno_proc_entry(
-    const char *name);
-
-#endif /* __ASM_XENO_PROC_H__ */
diff --git a/xenolinux-2.4.25-sparse/include/linux/blk.h b/xenolinux-2.4.25-sparse/include/linux/blk.h
index 4618a527f1..e7c7575454 100644
--- a/xenolinux-2.4.25-sparse/include/linux/blk.h
+++ b/xenolinux-2.4.25-sparse/include/linux/blk.h
@@ -55,9 +55,9 @@ extern int xpram_init(void);
 extern int tapeblock_init(void);
 #endif /* CONFIG_ARCH_S390 */
 
-#if defined(CONFIG_XENOLINUX_BLOCK)
+#if defined(CONFIG_XEN_VBD)
 extern int xlblk_init(void);
-#endif /* CONFIG_ARCH_XENO */
+#endif /* CONFIG_XEN_VBD */
 
 extern void set_device_ro(kdev_t dev,int flag);
 void add_blkdev_randomness(int major);
diff --git a/xenolinux-2.4.25-sparse/init/do_mounts.c b/xenolinux-2.4.25-sparse/init/do_mounts.c
index 8e2b89fbb3..6d09888fc8 100644
--- a/xenolinux-2.4.25-sparse/init/do_mounts.c
+++ b/xenolinux-2.4.25-sparse/init/do_mounts.c
@@ -255,7 +255,7 @@ static struct dev_name_struct {
 	{ "ftld", 0x2c18 },
 	{ "mtdblock", 0x1f00 },
 	{ "nb", 0x2b00 },
-#if defined(CONFIG_XENOLINUX_BLOCK)
+#if defined(CONFIG_XEN_VBD)
         { "xvda", 0x7D00 }, { "xvdb", 0x7D10 },
         { "xvdc", 0x7D20 }, { "xvdd", 0x7D30 },
         { "xvde", 0x7D40 }, { "xvdf", 0x7D50 },
diff --git a/xenolinux-2.4.25-sparse/kernel/panic.c b/xenolinux-2.4.25-sparse/kernel/panic.c
index 284bd434a3..9c96d92e40 100644
--- a/xenolinux-2.4.25-sparse/kernel/panic.c
+++ b/xenolinux-2.4.25-sparse/kernel/panic.c
@@ -109,7 +109,7 @@ NORET_TYPE void panic(const char * fmt, ...)
 		panic_blink(); 
 #endif
 		CHECK_EMERGENCY_SYNC
-#if defined(CONFIG_XENO)
+#if defined(CONFIG_XEN)
 		HYPERVISOR_exit();
 #endif
 	}
diff --git a/xenolinux-2.4.25-sparse/kernel/time.c b/xenolinux-2.4.25-sparse/kernel/time.c
index fe6ecde6d8..b4f8b55e8a 100644
--- a/xenolinux-2.4.25-sparse/kernel/time.c
+++ b/xenolinux-2.4.25-sparse/kernel/time.c
@@ -64,7 +64,7 @@ asmlinkage long sys_time(int * tloc)
 	return i;
 }
 
-#if !defined(CONFIG_XENO)
+#if !defined(CONFIG_XEN)
 
 /*
  * sys_stime() can be implemented in user-level using
diff --git a/xenolinux-2.4.25-sparse/mkbuildtree b/xenolinux-2.4.25-sparse/mkbuildtree
index 64818b45da..08b6ae1e5d 100755
--- a/xenolinux-2.4.25-sparse/mkbuildtree
+++ b/xenolinux-2.4.25-sparse/mkbuildtree
@@ -103,16 +103,16 @@ relative_lndir ${RS}
 rm -f mkbuildtree
 
 ## There are a whole bunch of special symlinks, mostly for files
-## which are identical in the i386 and xeno-i386 architecture-dependent
+## which are identical in the i386 and xen-i386 architecture-dependent
 ## subdirectories.
 
 # This first symlink is special: it links to shared files in Xen's source tree
-rm -rf ${AD}/include/asm-xeno/hypervisor-ifs
-mkdir  ${AD}/include/asm-xeno/hypervisor-ifs
-cd     ${AD}/include/asm-xeno/hypervisor-ifs
+rm -rf ${AD}/include/asm-xen/hypervisor-ifs
+mkdir  ${AD}/include/asm-xen/hypervisor-ifs
+cd     ${AD}/include/asm-xen/hypervisor-ifs
 relative_lndir ../../../${RS}/../xen/include/hypervisor-ifs
 
-# The remainder are the i386 -> xeno-i386 links
+# The remainder are the i386 -> xen-i386 links
 cd ..
 ln -sf ../asm-i386/a.out.h 
 ln -sf ../asm-i386/apicdef.h 
@@ -198,7 +198,7 @@ ln -sf ../asm-i386/unistd.h
 ln -sf ../asm-i386/user.h 
 ln -sf ../asm-i386/xor.h 
 
-cd ../../arch/xeno/kernel
+cd ../../arch/xen/kernel
 ln -sf ../../i386/kernel/i387.c
 ln -sf ../../i386/kernel/init_task.c
 ln -sf ../../i386/kernel/ptrace.c
diff --git a/xenolinux-2.4.25-sparse/mm/memory.c b/xenolinux-2.4.25-sparse/mm/memory.c
index 6e6bfac75c..312dbfa7c0 100644
--- a/xenolinux-2.4.25-sparse/mm/memory.c
+++ b/xenolinux-2.4.25-sparse/mm/memory.c
@@ -153,7 +153,7 @@ void clear_page_tables(struct mm_struct *mm, unsigned long first, int nr)
 		free_one_pgd(page_dir);
 		page_dir++;
 	} while (--nr);
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 	spin_unlock(&mm->page_table_lock);
 
 	/* keep the page table cache within bounds */
@@ -249,7 +249,7 @@ skip_copy_pte_range:		address = (address + PMD_SIZE) & PMD_MASK;
 
 				/* If it's a COW mapping, write protect it both in the parent and the child */
 				if (cow && pte_write(pte)) {
-					/* XENO modification: modified ordering here to avoid RaW hazard. */
+					/* XEN modification: modified ordering here to avoid RaW hazard. */
 					pte = *src_pte;
 					pte = pte_wrprotect(pte);
 					ptep_set_wrprotect(src_pte);
@@ -318,7 +318,7 @@ static inline int zap_pte_range(mmu_gather_t *tlb, pmd_t * pmd, unsigned long ad
 			continue;
 		if (pte_present(pte)) {
 			struct page *page = pte_page(pte);
-#if defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
 			if (pte_io(pte)) {
 				queue_l1_entry_update(ptep, 0);
 				continue;
@@ -918,9 +918,9 @@ int remap_page_range(unsigned long from, unsigned long phys_addr, unsigned long
  */
 static inline void establish_pte(struct vm_area_struct * vma, unsigned long address, pte_t *page_table, pte_t entry)
 {
-#ifdef CONFIG_XENO
+#ifdef CONFIG_XEN
 	if ( likely(vma->vm_mm == current->mm) ) {
-		XENO_flush_page_update_queue();
+		XEN_flush_page_update_queue();
 		HYPERVISOR_update_va_mapping(address>>PAGE_SHIFT, entry, UVMF_INVLPG);
 	} else {
 		set_pte(page_table, entry);
@@ -1193,13 +1193,13 @@ static int do_swap_page(struct mm_struct * mm,
 
 	flush_page_to_ram(page);
 	flush_icache_page(vma, page);
-#ifdef CONFIG_XENO
+#ifdef CONFIG_XEN
 	if ( likely(vma->vm_mm == current->mm) ) {
-		XENO_flush_page_update_queue();
+		XEN_flush_page_update_queue();
 		HYPERVISOR_update_va_mapping(address>>PAGE_SHIFT, pte, 0);
 	} else {
 		set_pte(page_table, pte);
-		XENO_flush_page_update_queue();
+		XEN_flush_page_update_queue();
 	}
 #else
 	set_pte(page_table, pte);
@@ -1248,13 +1248,13 @@ static int do_anonymous_page(struct mm_struct * mm, struct vm_area_struct * vma,
 		mark_page_accessed(page);
 	}
 
-#ifdef CONFIG_XENO
+#ifdef CONFIG_XEN
 	if ( likely(vma->vm_mm == current->mm) ) {
-		XENO_flush_page_update_queue();
+		XEN_flush_page_update_queue();
 		HYPERVISOR_update_va_mapping(addr>>PAGE_SHIFT, entry, 0);
 	} else {
 		set_pte(page_table, entry);
-		XENO_flush_page_update_queue();
+		XEN_flush_page_update_queue();
 	}
 #else
 	set_pte(page_table, entry);
@@ -1333,13 +1333,13 @@ static int do_no_page(struct mm_struct * mm, struct vm_area_struct * vma,
 		entry = mk_pte(new_page, vma->vm_page_prot);
 		if (write_access)
 			entry = pte_mkwrite(pte_mkdirty(entry));
-#ifdef CONFIG_XENO
+#ifdef CONFIG_XEN
 		if ( likely(vma->vm_mm == current->mm) ) {
-			XENO_flush_page_update_queue();
+			XEN_flush_page_update_queue();
 			HYPERVISOR_update_va_mapping(address>>PAGE_SHIFT, entry, 0);
 		} else {
 			set_pte(page_table, entry);
-			XENO_flush_page_update_queue();
+			XEN_flush_page_update_queue();
 		}
 #else
 		set_pte(page_table, entry);
@@ -1487,7 +1487,7 @@ pte_t *pte_alloc(struct mm_struct *mm, pmd_t *pmd, unsigned long address)
 		/* "fast" allocation can happen without dropping the lock.. */
 		new = pte_alloc_one_fast(mm, address);
 		if (!new) {
-			XENO_flush_page_update_queue();
+			XEN_flush_page_update_queue();
 			spin_unlock(&mm->page_table_lock);
 			new = pte_alloc_one(mm, address);
 			spin_lock(&mm->page_table_lock);
diff --git a/xenolinux-2.4.25-sparse/mm/mprotect.c b/xenolinux-2.4.25-sparse/mm/mprotect.c
index e618a3b74d..9d2ed3c24c 100644
--- a/xenolinux-2.4.25-sparse/mm/mprotect.c
+++ b/xenolinux-2.4.25-sparse/mm/mprotect.c
@@ -288,7 +288,7 @@ asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot
 	if (!vma || vma->vm_start > start)
 		goto out;
 
-#if defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
 	/* mprotect() unsupported for I/O mappings in Xenolinux. */
 	error = -EINVAL;
 	if (vma->vm_flags & VM_IO)
diff --git a/xenolinux-2.4.25-sparse/mm/mremap.c b/xenolinux-2.4.25-sparse/mm/mremap.c
index 5af0b100f9..517854c86c 100644
--- a/xenolinux-2.4.25-sparse/mm/mremap.c
+++ b/xenolinux-2.4.25-sparse/mm/mremap.c
@@ -115,11 +115,11 @@ static int move_page_tables(struct mm_struct * mm,
 	 * the old page tables)
 	 */
 oops_we_failed:
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 	flush_cache_range(mm, new_addr, new_addr + len);
 	while ((offset += PAGE_SIZE) < len)
 		move_one_page(mm, new_addr + offset, old_addr + offset);
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 	zap_page_range(mm, new_addr, len);
 	return -1;
 }
@@ -309,7 +309,7 @@ unsigned long do_mremap(unsigned long addr,
 	    !vm_enough_memory((new_len - old_len) >> PAGE_SHIFT))
 		goto out;
 
-#if defined(CONFIG_XENO_PRIV)
+#if defined(CONFIG_XEN_PRIVILEGED_GUEST)
 	/* mremap() unsupported for I/O mappings in Xenolinux. */
 	ret = -EINVAL;
 	if (vma->vm_flags & VM_IO)
diff --git a/xenolinux-2.4.25-sparse/mm/swapfile.c b/xenolinux-2.4.25-sparse/mm/swapfile.c
index de04a376d2..8345e27146 100644
--- a/xenolinux-2.4.25-sparse/mm/swapfile.c
+++ b/xenolinux-2.4.25-sparse/mm/swapfile.c
@@ -464,7 +464,7 @@ static void unuse_process(struct mm_struct * mm,
 		pgd_t * pgd = pgd_offset(mm, vma->vm_start);
 		unuse_vma(vma, pgd, entry, page);
 	}
-	XENO_flush_page_update_queue();
+	XEN_flush_page_update_queue();
 	spin_unlock(&mm->page_table_lock);
 	return;
 }
diff --git a/xenolinux-2.4.25-sparse/mm/vmalloc.c b/xenolinux-2.4.25-sparse/mm/vmalloc.c
index b5b4da9161..dc1c7fe550 100644
--- a/xenolinux-2.4.25-sparse/mm/vmalloc.c
+++ b/xenolinux-2.4.25-sparse/mm/vmalloc.c
@@ -248,7 +248,7 @@ void vfree(void * addr)
 	for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
 		if (tmp->addr == addr) {
 			*p = tmp->next;
-#ifdef CONFIG_XENO_PRIV
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
 			if (tmp->flags & VM_IOREMAP)
 				zap_page_range(&init_mm, VMALLOC_VMADDR(tmp->addr), tmp->size);
 			else
author	kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>	2004-03-23 10:40:28 +0000
committer	kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>	2004-03-23 10:40:28 +0000
commit	e08c905aad06e3a49269d376169be3180dcdd4e4 (patch)
tree	7973fd2f7e385a1b20d5c801644c56fd6de51bf9
parent	e4a5ef641cce7a76b63bac12ff7a7e3dbbd10e6e (diff)
download	xen-e08c905aad06e3a49269d376169be3180dcdd4e4.tar.gz xen-e08c905aad06e3a49269d376169be3180dcdd4e4.tar.bz2 xen-e08c905aad06e3a49269d376169be3180dcdd4e4.zip