103 files changed, 271 insertions, 151 deletions

diff --git a/.hg-to-bk b/.hg-to-bk
index 3b63679d35..b00523b9e0 100755
--- a/.hg-to-bk
+++ b/.hg-to-bk
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 set -e
-ln -s xenolinux-2.4.25-sparse xenolinux-sparse
+ln -s xenolinux-2.4.26-sparse xenolinux-sparse
 (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
 exit 0
diff --git a/.rootkeys b/.rootkeys
index 1938f8edbb..ae6f465049 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -646,105 +646,105 @@
 3eb3c87fmKYTC5GCh_rydFakZp9ayw xen/tools/figlet/README
 3eb3c87fdQKQ5OBGbM-KjZfi9Us4ng xen/tools/figlet/figlet.c
 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/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
-40648526SxcA4lGIHB_k7ID8VlRSzw xenolinux-2.4.25-sparse/arch/xen/defconfig-physdev
-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
-4075806dI5kfeMD5RV-DA0PYoThx_w xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/Makefile
-4075806d3fJqqDC1pYYPTZPc575iKg xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/block.c
-4075806d4-j7vN0Mn0bklI1cRUX1vQ xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/block.h
-4075806dibjCcfuXv6CINMhxWTw3jQ xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/vbd.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
-4075806dE5mQwlVUf8-t3YXjiMMWDQ xenolinux-2.4.25-sparse/arch/xen/kernel/ctrl_if.c
-3e5a4e65_hqfuxtGG8IUy6wRM86Ecg xenolinux-2.4.25-sparse/arch/xen/kernel/entry.S
-3e5a4e65ibVQmwlOn0j3sVH_j_6hAg xenolinux-2.4.25-sparse/arch/xen/kernel/evtchn.c
-3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg xenolinux-2.4.25-sparse/arch/xen/kernel/head.S
-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
-4051db95N9N99FjsRwi49YKUNHWI8A xenolinux-2.4.25-sparse/arch/xen/kernel/pci-pc.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/xen_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-xen/bugs.h
-4048c0ddxnIa2GpBAVR-mY6mNSdeJg xenolinux-2.4.25-sparse/include/asm-xen/ctrl_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
-406aeeaaQvl4RNtmd9hDEugBURbFpQ 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
-4062f7e2PzFOUGT0PaE7A0VprTU3JQ xenolinux-2.4.25-sparse/include/asm-xen/synch_bitops.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/xen_proc.h
-40659defgWA92arexpMGn8X3QMDj3w xenolinux-2.4.25-sparse/include/asm-xen/xor.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
-3e5a4e686V0nioX2ZpFf056sgvdiQw xenolinux-2.4.25-sparse/include/linux/sunrpc/debug.h
-401c0592pLrp_aCbQRo9GXiYQQaVVA xenolinux-2.4.25-sparse/include/linux/timer.h
-3e5a4e68W_hpMlM3u_-QOKMp3gzcwQ xenolinux-2.4.25-sparse/init/do_mounts.c
-3f9d4b44247udoqWEgFkaHiWv6Uvyg xenolinux-2.4.25-sparse/kernel/time.c
-401c059bjLBFYHRD4Py2uM3eA1D4zQ xenolinux-2.4.25-sparse/kernel/timer.c
-3e6e7c1efbQe93xCvOpOVCnXTMmQ5w xenolinux-2.4.25-sparse/mkbuildtree
-406aeeafkrnCuIVWLFv3kfn4uAD5Eg xenolinux-2.4.25-sparse/mm/highmem.c
-3e5a4e68GxCIaFH4sy01v1wjapetaA xenolinux-2.4.25-sparse/mm/memory.c
-3f108af5VxPkLv13tXpXgoRKALQtXQ xenolinux-2.4.25-sparse/mm/mprotect.c
-3e5a4e681xMPdF9xCMwpyfuYMySU5g xenolinux-2.4.25-sparse/mm/mremap.c
-3e5a4e683HKVU-sxtagrDasRB8eBVw xenolinux-2.4.25-sparse/mm/swapfile.c
-3f108af81Thhb242EmKjGCYkjx-GJA xenolinux-2.4.25-sparse/mm/vmalloc.c
-4035ec2a01koiU1fDolJ0GyMOZhU5A xenolinux-sparse
+3f05a939TA3SLPY7ZiScMotLjg9owQ xenolinux-2.4.26-sparse/Documentation/Configure.help
+3e5a4e6589G-U42lFKs43plskXoFxQ xenolinux-2.4.26-sparse/Makefile
+3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg xenolinux-2.4.26-sparse/arch/xen/Makefile
+3e5a4e65n-KhsEAs-A4ULiStBp-r6w xenolinux-2.4.26-sparse/arch/xen/boot/Makefile
+3e5a4e65OV_j_DBtjzt5vej771AJsA xenolinux-2.4.26-sparse/arch/xen/config.in
+3e5a4e65TNEycLeXqPSXQJQm_xGecA xenolinux-2.4.26-sparse/arch/xen/defconfig
+40648526SxcA4lGIHB_k7ID8VlRSzw xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev
+3e6377f5xwPfYZkPHPrDbEq1PRN7uQ xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/Makefile
+3e6377f8Me8IqtvEhb70XFgOvqQH7A xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/balloon.c
+3e5a4e65iHEuC5sjFhj42XALYbLVRw xenolinux-2.4.26-sparse/arch/xen/drivers/block/Makefile
+3e5a4e65pP5spJErBW69pJxSSdK9RA xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.c
+3e67f822FOPwqHiaRKbrskgWgoNL5g xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.h
+3e676eb5RXnHzSHgA1BvM0B1aIm4qg xenolinux-2.4.26-sparse/arch/xen/drivers/block/vbd.c
+3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ xenolinux-2.4.26-sparse/arch/xen/drivers/console/Makefile
+3e5a4e651TH-SXHoufurnWjgl5bfOA xenolinux-2.4.26-sparse/arch/xen/drivers/console/console.c
+3e5a4e656nfFISThfbyXQOA6HN6YHw xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/Makefile
+3e5a4e65BXtftInNHUC2PjDfPhdZZA xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c
+3e5a4e65gfn_ltB8ujHMVFApnTTNRQ xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/vfr.c
+40420a6ebRqDjufoN1WSJvolEW2Wjw xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/Makefile
+40420a73Wou6JlsZDiu6YwjYomsm7A xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/evtchn.c
+3e5a4e65gZBRBB6RsSVg1c9iahigAw xenolinux-2.4.26-sparse/arch/xen/drivers/network/Makefile
+3e5a4e65ZxKrbFetVB84JhrTyZ1YuQ xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c
+4075806dI5kfeMD5RV-DA0PYoThx_w xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
+4075806d3fJqqDC1pYYPTZPc575iKg xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.c
+4075806d4-j7vN0Mn0bklI1cRUX1vQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.h
+4075806dibjCcfuXv6CINMhxWTw3jQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vbd.c
+405853f2wg7JXZJNltspMwOZJklxgw xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
+405853f6nbeazrNyEWNHBuoSg2PiPA xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/vnetif.c
+3e5a4e65lWzkiPXsZdzPt2RNnJGG1g xenolinux-2.4.26-sparse/arch/xen/kernel/Makefile
+4075806dE5mQwlVUf8-t3YXjiMMWDQ xenolinux-2.4.26-sparse/arch/xen/kernel/ctrl_if.c
+3e5a4e65_hqfuxtGG8IUy6wRM86Ecg xenolinux-2.4.26-sparse/arch/xen/kernel/entry.S
+3e5a4e65ibVQmwlOn0j3sVH_j_6hAg xenolinux-2.4.26-sparse/arch/xen/kernel/evtchn.c
+3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg xenolinux-2.4.26-sparse/arch/xen/kernel/head.S
+3e5a4e65RMGcuA-HCn3-wNx3fFQwdg xenolinux-2.4.26-sparse/arch/xen/kernel/i386_ksyms.c
+3e5a4e65MEvZhlr070sK5JsfAQlv7Q xenolinux-2.4.26-sparse/arch/xen/kernel/ioport.c
+3e5a4e653U6cELGv528IxOLHvCq8iA xenolinux-2.4.26-sparse/arch/xen/kernel/irq.c
+3e5a4e65muT6SU3ck47IP87Q7Ti5hA xenolinux-2.4.26-sparse/arch/xen/kernel/ldt.c
+4051db84bZeRX7a_Kh6VyyDuT5FOIg xenolinux-2.4.26-sparse/arch/xen/kernel/pci-dma.c
+4051db95N9N99FjsRwi49YKUNHWI8A xenolinux-2.4.26-sparse/arch/xen/kernel/pci-pc.c
+3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ xenolinux-2.4.26-sparse/arch/xen/kernel/process.c
+3e5a4e66tR-qJMLj3MppcKqmvuI2XQ xenolinux-2.4.26-sparse/arch/xen/kernel/setup.c
+3e5a4e66fWSTagLGU2P8BGFGRjhDiw xenolinux-2.4.26-sparse/arch/xen/kernel/signal.c
+3e5a4e66N__lUXNwzQ-eADRzK9LXuQ xenolinux-2.4.26-sparse/arch/xen/kernel/time.c
+3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ xenolinux-2.4.26-sparse/arch/xen/kernel/traps.c
+3e5a4e66-9_NczrVMbuQkoSLyXckIw xenolinux-2.4.26-sparse/arch/xen/lib/Makefile
+3e5a4e6637ZDk0BvFEC-aFQs599-ng xenolinux-2.4.26-sparse/arch/xen/lib/delay.c
+3f68905cF5i8-NYpIhGjKmh0y8Gu5g xenolinux-2.4.26-sparse/arch/xen/lib/xen_proc.c
+3e5a4e66croVgpcJyJuF2ycQw0HuJw xenolinux-2.4.26-sparse/arch/xen/mm/Makefile
+3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg xenolinux-2.4.26-sparse/arch/xen/mm/fault.c
+3e5a4e668SE9rixq4ahho9rNhLUUFQ xenolinux-2.4.26-sparse/arch/xen/mm/hypervisor.c
+3e5a4e661gLzzff25pJooKIIWe7IWg xenolinux-2.4.26-sparse/arch/xen/mm/init.c
+3f0bed43UUdQichXAiVNrjV-y2Kzcg xenolinux-2.4.26-sparse/arch/xen/mm/ioremap.c
+3e5a4e66qRlSTcjafidMB6ulECADvg xenolinux-2.4.26-sparse/arch/xen/vmlinux.lds
+3e5a4e66mrtlmV75L1tjKDg8RaM5gA xenolinux-2.4.26-sparse/drivers/block/ll_rw_blk.c
+3f108aeaLcGDgQdFAANLTUEid0a05w xenolinux-2.4.26-sparse/drivers/char/mem.c
+3e5a4e66rw65CxyolW9PKz4GG42RcA xenolinux-2.4.26-sparse/drivers/char/tty_io.c
+3e5a4e669uzIE54VwucPYtGwXLAbzA xenolinux-2.4.26-sparse/fs/exec.c
+3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.26-sparse/include/asm-xen/bugs.h
+4048c0ddxnIa2GpBAVR-mY6mNSdeJg xenolinux-2.4.26-sparse/include/asm-xen/ctrl_if.h
+3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.26-sparse/include/asm-xen/desc.h
+4048c0e0_P2wUTiT6UqgPhn0s7yFcA xenolinux-2.4.26-sparse/include/asm-xen/evtchn.h
+3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw xenolinux-2.4.26-sparse/include/asm-xen/fixmap.h
+406aeeaaQvl4RNtmd9hDEugBURbFpQ xenolinux-2.4.26-sparse/include/asm-xen/highmem.h
+3e5a4e67YtcyDLQsShhCfQwPSELfvA xenolinux-2.4.26-sparse/include/asm-xen/hw_irq.h
+3e5a4e677VBavzM1UZIEcH1B-RlXMA xenolinux-2.4.26-sparse/include/asm-xen/hypervisor.h
+4060044fVx7-tokvNLKBf_6qBB4lqQ xenolinux-2.4.26-sparse/include/asm-xen/io.h
+3e5a4e673p7PEOyHFm3nHkYX6HQYBg xenolinux-2.4.26-sparse/include/asm-xen/irq.h
+3ead095db_LRUXnxaqs0dA1DWhPoQQ xenolinux-2.4.26-sparse/include/asm-xen/keyboard.h
+3e5a4e678ddsQOpbSiRdy1GRcDc9WA xenolinux-2.4.26-sparse/include/asm-xen/mmu_context.h
+3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ xenolinux-2.4.26-sparse/include/asm-xen/msr.h
+3e7270deQqtGPSnFxcW4AvJZuTUWfg xenolinux-2.4.26-sparse/include/asm-xen/multicall.h
+3e5a4e67mnQfh-R8KcQCaVo2Oho6yg xenolinux-2.4.26-sparse/include/asm-xen/page.h
+3e5a4e67uTYU5oEnIDjxuaez8njjqg xenolinux-2.4.26-sparse/include/asm-xen/pgalloc.h
+3e5a4e67X7JyupgdYkgDX19Huj2sAw xenolinux-2.4.26-sparse/include/asm-xen/pgtable-2level.h
+3e5a4e67gr4NLGtQ5CvSLimMYZlkOA xenolinux-2.4.26-sparse/include/asm-xen/pgtable.h
+3f108af1qNv8DVSGPv4zpqIU1txCkg xenolinux-2.4.26-sparse/include/asm-xen/proc_cmd.h
+3e5a4e676uK4xErTBDH6XJREn9LSyg xenolinux-2.4.26-sparse/include/asm-xen/processor.h
+3e5a4e67AJPjW-zL7p-xWuA6IVeH1g xenolinux-2.4.26-sparse/include/asm-xen/ptrace.h
+3e5a4e68uJz-xI0IBVMD7xRLQKJDFg xenolinux-2.4.26-sparse/include/asm-xen/segment.h
+3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA xenolinux-2.4.26-sparse/include/asm-xen/smp.h
+3fa8e3f0kBLeE4To2vpdi3cpJbIkbQ xenolinux-2.4.26-sparse/include/asm-xen/suspend.h
+4062f7e2PzFOUGT0PaE7A0VprTU3JQ xenolinux-2.4.26-sparse/include/asm-xen/synch_bitops.h
+3e5a4e68mTr0zcp9SXDbnd-XLrrfxw xenolinux-2.4.26-sparse/include/asm-xen/system.h
+3f1056a9L_kqHcFheV00KbKBzv9j5w xenolinux-2.4.26-sparse/include/asm-xen/vga.h
+3f689063nhrIRsMMZjZxMFk7iEINqQ xenolinux-2.4.26-sparse/include/asm-xen/xen_proc.h
+40659defgWA92arexpMGn8X3QMDj3w xenolinux-2.4.26-sparse/include/asm-xen/xor.h
+3f056927gMHl7mWB89rb73JahbhQIA xenolinux-2.4.26-sparse/include/linux/blk.h
+3e5a4e68WLX3B8owTvktP3HHOtznPQ xenolinux-2.4.26-sparse/include/linux/major.h
+401c0590D_kwJDU59X8NyvqSv_Cl2A xenolinux-2.4.26-sparse/include/linux/sched.h
+3e5a4e686V0nioX2ZpFf056sgvdiQw xenolinux-2.4.26-sparse/include/linux/sunrpc/debug.h
+401c0592pLrp_aCbQRo9GXiYQQaVVA xenolinux-2.4.26-sparse/include/linux/timer.h
+3e5a4e68W_hpMlM3u_-QOKMp3gzcwQ xenolinux-2.4.26-sparse/init/do_mounts.c
+3f9d4b44247udoqWEgFkaHiWv6Uvyg xenolinux-2.4.26-sparse/kernel/time.c
+401c059bjLBFYHRD4Py2uM3eA1D4zQ xenolinux-2.4.26-sparse/kernel/timer.c
+3e6e7c1efbQe93xCvOpOVCnXTMmQ5w xenolinux-2.4.26-sparse/mkbuildtree
+406aeeafkrnCuIVWLFv3kfn4uAD5Eg xenolinux-2.4.26-sparse/mm/highmem.c
+3e5a4e68GxCIaFH4sy01v1wjapetaA xenolinux-2.4.26-sparse/mm/memory.c
+3f108af5VxPkLv13tXpXgoRKALQtXQ xenolinux-2.4.26-sparse/mm/mprotect.c
+3e5a4e681xMPdF9xCMwpyfuYMySU5g xenolinux-2.4.26-sparse/mm/mremap.c
+3e5a4e683HKVU-sxtagrDasRB8eBVw xenolinux-2.4.26-sparse/mm/swapfile.c
+3f108af81Thhb242EmKjGCYkjx-GJA xenolinux-2.4.26-sparse/mm/vmalloc.c
+407eb087XaNDLn8thVDLH-rI0hG-Xw xenolinux-sparse
diff --git a/xenolinux-2.4.25-sparse/Documentation/Configure.help b/xenolinux-2.4.26-sparse/Documentation/Configure.help
index 8fff3cae45..e39bed91d6 100644
--- a/xenolinux-2.4.25-sparse/Documentation/Configure.help
+++ b/xenolinux-2.4.26-sparse/Documentation/Configure.help
@@ -1167,6 +1167,14 @@ CONFIG_AMD74XX_OVERRIDE
   This effect can be also invoked by calling "idex=ata66"
   If unsure, say N.
 
+ATI IXP chipset IDE support
+CONFIG_BLK_DEV_ATIIXP
+  This driver adds explicit support for ATI IXP chipset.
+  This allows the kernel to change PIO, DMA and UDMA speeds
+  and to configure the chip to optimum performance.
+
+  Say Y here if you have an ATI IXP chipset IDE controller.
+
 CMD64X/CMD680 chipset support
 CONFIG_BLK_DEV_CMD64X
   Say Y here if you have an IDE controller which uses any of these
@@ -2093,6 +2101,40 @@ CONFIG_BLK_DEV_ATARAID_HPT
   If you choose to compile this as a module, the module will be called
   hptraid.o.
 
+CMD/Silicon Image Medley Software RAID
+CONFIG_BLK_DEV_ATARAID_MEDLEY
+  Say Y or M if you have a Silicon Image 3112 SATA RAID controller,
+  a CMD680 based controller, or another IDE RAID controller that uses
+  CMD's Medley software RAID, and want Linux to use the software RAID
+  feature of this card.  This driver uses /dev/ataraid/dXpY (X and Y
+  numbers) as device names.
+
+  This driver currently only supports RAID0 (striped) mode, so if you
+  are using RAID1 (mirroring) this will not work for you. In that
+  case, you may want to try the Silicon Image Medley Software RAID
+  driver (below).
+
+  Support for mirroring is planned in the future.
+
+  If you choose to compile this as a module, the module will be called
+  medley.o.
+
+Silicon Image Medley Software RAID (old driver)
+CONFIG_BLK_DEV_ATARAID_SII
+  Say Y or M if you have a Silicon Image SATARaid controller
+  and want Linux to use the softwareraid feature of this card.
+  This driver uses /dev/ataraid/dXpY (X and Y numbers) as device
+  names.
+
+  This driver does not reliably detect all Medley RAID sets, and could
+  be dangerous if you have a striped set with disks of different size.
+
+  You should use the new Medley RAID driver (above), unless you use
+  RAID1 (mirroring), which the new driver does not yet support.
+
+  If you choose to compile this as a module, the module will be called
+  silraid.o.
+
 Support for Acer PICA 1 chipset
 CONFIG_ACER_PICA_61
   This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
@@ -6214,17 +6256,6 @@ CONFIG_IP_SCTP
 
   If in doubt, say N.
 
-SCTP: Use old checksum (Adler-32)
-CONFIG_SCTP_ADLER32
-  RCF2960 currently specifies the Adler-32 checksum algorithm for SCTP.
-  This has been deprecated and replaced by an algorithm now referred
-  to as crc32c.
-
-  If you say Y, this will use the Adler-32 algorithm, this might be 
-  useful for interoperation with downlevel peers. 
-
-  If unsure, say N.  
-
 SCTP: Debug messages
 CONFIG_SCTP_DBG_MSG
   If you say Y, this will enable verbose debugging messages. 
@@ -6242,6 +6273,29 @@ CONFIG_SCTP_DBG_OBJCNT
 
   If unsure, say N
 
+#choice
+SCTP: HMAC algorithm
+CONFIG_SCTP_HMAC_NONE
+  Choose an HMAC algorithm to be used during association establishment.
+  It can be one of SHA1, MD5 or NONE. It is advised to use either HMAC-MD5
+  or HMAC-SHA1.
+  See configuration for Cryptographic API and enable these algorithms
+  to make usable by SCTP.
+
+SCTP: SHA1 HMAC algorithm
+CONFIG_SCTP_HMAC_SHA1
+  Enable the use of HMAC-SHA1 during association establishment.  It 
+  is advised to use either HMAC-MD5 or HMAC-SHA1.
+  See configuration for Cryptographic API and enable these algorithms
+  to make usable by SCTP.
+
+SCTP: MD5 HMAC algorithm
+config SCTP_HMAC_MD5
+  Enable the use of HMAC-MD5 during association establishment.  It is 
+  advised to use either HMAC-MD5 or HMAC-SHA1.
+  See configuration for Cryptographic API and enable these algorithms
+  to make usable by SCTP.
+
 Kernel httpd acceleration
 CONFIG_KHTTPD
   The kernel httpd acceleration daemon (kHTTPd) is a (limited) web
@@ -7009,8 +7063,11 @@ CONFIG_PACKET
 
 Packet socket: mmapped IO
 CONFIG_PACKET_MMAP
-  If you say Y here, the Packet protocol driver will use an IO
-  mechanism that results in faster communication.
+  If you say Y here, the Packet protocol driver can use a faster and 
+  more efficient capture method. This feature also allows bigger 
+  receive buffers. To take advantage of this method who have to use 
+  a libpcap library that supports it. For more info see
+  <file:Documentation/networking/packet_mmap.txt>.
 
   If unsure, say N.
 
@@ -10245,6 +10302,19 @@ CONFIG_AIRO_CS
   say M here and read <file:Documentation/modules.txt>.  The module
   will be called airo_cs.o.
 
+Atmel at76c502/at76c504 PCMCIA cards
+CONFIG_PCMCIA_ATMEL
+  A driver for PCMCIA 802.11 wireless cards based on the 
+  Atmel fast-vnet chips. This driver supports standard
+  Linux wireless extensions. 
+
+  Many  cards based on this chipset do not have flash memory
+  and need their firmware loaded at start-up. If yours is 
+  one of these, you will need to provide a firmware image
+  to be loaded into the card by the driver. The Atmel
+  firmware package can be downloaded from
+  http://www.thekelleys.org.uk/atmel/atmel_firmware.tar.gz
+
 Aviator/Raytheon 2.4MHz wireless support
 CONFIG_PCMCIA_RAYCS
   Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
@@ -10778,6 +10848,14 @@ CONFIG_NET_SCH_TBF
   whenever you want). If you want to compile it as a module, say M
   here and read <file:Documentation/modules.txt>.
 
+Network delay simualtor  
+CONFIG_NET_SCH_DELAY
+  Say Y if you want to delay packets by a fixed amount of
+  time. This is often useful to simulate network delay when
+  testing applications or protocols.
+  
+  This code is also available as a module called sch_delay.o
+
 Ingress Qdisc
 CONFIG_NET_SCH_INGRESS
   If you say Y here, you will be able to police incoming bandwidth
@@ -12366,6 +12444,16 @@ CONFIG_B44
   <file:Documentation/networking/net-modules.txt>.  The module will be
   called b44.
 
+nForce Ethernet support (EXPERIMENTAL)
+CONFIG_FORCEDETH
+  If you have a network (Ethernet) controller of this type, say Y and
+  read the Ethernet-HOWTO, available from
+  <http://www.tldp.org/docs.html#howto>.
+
+  To compile this driver as a module, choose M here and read
+  <file:Documentation/networking/net-modules.txt>.  The module will be
+  called forcedeth.o.
+
 CS89x0 support (Daynaport CS and LC cards)
 CONFIG_CS89x0
   Support for CS89x0 chipset based Ethernet cards. If you have a
@@ -19938,14 +20026,6 @@ CONFIG_ACPI_DEBUG
   of verbosity. Saying Y enables these statements. This will increase
   your kernel size by around 50K.
 
-ACPI Relaxed AML Checking
-CONFIG_ACPI_RELAXED_AML
-  If you say `Y' here, the ACPI interpreter will relax its checking
-  for valid AML and will ignore some AML mistakes, such as off-by-one
-  errors in region sizes.  Some laptops may require this option.  In
-  particular, many Toshiba laptops require this for correct operation
-  of the AC module.
-
 ACPI Button
 CONFIG_ACPI_BUTTON
   This driver registers for events based on buttons, such as the
@@ -23560,7 +23640,7 @@ CONFIG_OKTAGON_SCSI
   If you have the BSC Oktagon SCSI disk controller for the Amiga, say
   Y to this question.  If you're in doubt about whether you have one,
   see the picture at
-  <http://amiga.multigraph.com/photos/oktagon.html>.
+  <http://amiga.resource.cx/exp/search.pl?product=oktagon>.
 
 Atari native SCSI support
 CONFIG_ATARI_SCSI
@@ -28720,6 +28800,13 @@ CONFIG_CRYPTO_CAST6
   The CAST6 encryption algorithm (synonymous with CAST-256) is
   described in RFC2612.
 
+CONFIG_CRYPTO_ARC4
+  ARC4 cipher algorithm.
+  
+  This is a stream cipher using keys ranging from 8 bits to 2048
+  bits in length.  ARC4 is commonly used in protocols such as WEP 
+  and SSL.
+
 CONFIG_CRYPTO_DEFLATE
   This is the Deflate algorithm (RFC1951), specified for use in
   IPSec with the IPCOMP protocol (RFC3173, RFC2394).
diff --git a/xenolinux-2.4.25-sparse/Makefile b/xenolinux-2.4.26-sparse/Makefile
index ab8d46856f..797fdc98e9 100644
--- a/xenolinux-2.4.25-sparse/Makefile
+++ b/xenolinux-2.4.26-sparse/Makefile
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 25
+SUBLEVEL = 26
 EXTRAVERSION =
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -234,7 +234,8 @@ CLEAN_FILES = \
 	drivers/tc/lk201-map.c \
 	net/khttpd/make_times_h \
 	net/khttpd/times.h \
-	submenu*
+	submenu* \
+	drivers/ieee1394/oui.c
 # directories removed with 'make clean'
 CLEAN_DIRS = \
 	modules
diff --git a/xenolinux-2.4.25-sparse/arch/xen/Makefile b/xenolinux-2.4.26-sparse/arch/xen/Makefile
index aba91a2414..aba91a2414 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/boot/Makefile b/xenolinux-2.4.26-sparse/arch/xen/boot/Makefile
index 64b402e833..64b402e833 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/boot/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/boot/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/config.in b/xenolinux-2.4.26-sparse/arch/xen/config.in
index c66383f643..c66383f643 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/config.in
+++ b/xenolinux-2.4.26-sparse/arch/xen/config.in
diff --git a/xenolinux-2.4.25-sparse/arch/xen/defconfig b/xenolinux-2.4.26-sparse/arch/xen/defconfig
index be28c82d7f..4d3c32df74 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/defconfig
+++ b/xenolinux-2.4.26-sparse/arch/xen/defconfig
@@ -8,12 +8,10 @@ CONFIG_ISA=y
 CONFIG_UID16=y
 
 #
-# Xenolinux options
+# Xen
 #
-# support for privileged domains
 CONFIG_XEN_PRIVILEGED_GUEST=y
 # CONFIG_XEN_PHYSDEV_ACCESS is not set
-# on-demand timer setting (taken from s390 patch set)
 CONFIG_NO_IDLE_HZ=y
 
 #
@@ -35,6 +33,8 @@ CONFIG_M686=y
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUM4 is not set
 # CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MVIAC3_2 is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_CMPXCHG=y
@@ -50,14 +50,11 @@ CONFIG_X86_TSC=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
 
 #
 # General setup
 #
 CONFIG_NET=y
-# CONFIG_PCI is not set
-# CONFIG_PCI_NAMES is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff --git a/xenolinux-2.4.25-sparse/arch/xen/defconfig-physdev b/xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev
index 8255e6c9ff..8255e6c9ff 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/defconfig-physdev
+++ b/xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/Makefile
index 9fb2227978..9fb2227978 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/balloon.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/balloon.c
index aee0e4cf99..aee0e4cf99 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/balloon/balloon.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/balloon.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/Makefile
index 35986ca54a..35986ca54a 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.c
index d00dd98f7b..d00dd98f7b 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.h b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.h
index e41e03970e..e41e03970e 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/block.h
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.h
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/vbd.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/vbd.c
index e08b976c56..e08b976c56 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/block/vbd.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/block/vbd.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/console/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/console/Makefile
index aaa546a8f3..aaa546a8f3 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/console/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/console/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/console/console.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/console/console.c
index a6ee346857..a6ee346857 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/console/console.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/console/console.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/Makefile
index 3e2e17bd23..3e2e17bd23 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/core.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c
index b59f3e8a84..b59f3e8a84 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/core.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/core.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/vfr.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/vfr.c
index 9d8ca0a32d..9d8ca0a32d 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/dom0/vfr.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/vfr.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/Makefile
index 61c983f625..61c983f625 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/evtchn.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/evtchn.c
index 985d72821d..985d72821d 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/evtchn/evtchn.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/evtchn.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/network/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/Makefile
index 2e4c1f4825..2e4c1f4825 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/network/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/network/network.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c
index ef54ff7fe9..ef54ff7fe9 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/network/network.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
index 35986ca54a..35986ca54a 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/block.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.c
index d00dd98f7b..d00dd98f7b 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/block.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/block.h b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.h
index e41e03970e..e41e03970e 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/block.h
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/block.h
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/vbd.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vbd.c
index e08b976c56..e08b976c56 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/vblkif/vbd.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vbd.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
index 304c2e78ef..304c2e78ef 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/vnetif.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/vnetif.c
index d1a4b21ad0..d1a4b21ad0 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/drivers/vnetif/vnetif.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/vnetif.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/Makefile b/xenolinux-2.4.26-sparse/arch/xen/kernel/Makefile
index 90438fa623..90438fa623 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/ctrl_if.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/ctrl_if.c
index 4002ae4c61..4002ae4c61 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/ctrl_if.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/ctrl_if.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/entry.S b/xenolinux-2.4.26-sparse/arch/xen/kernel/entry.S
index 305bd42c70..305bd42c70 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/entry.S
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/entry.S
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/evtchn.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/evtchn.c
index 4f933057c2..4f933057c2 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/evtchn.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/evtchn.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/head.S b/xenolinux-2.4.26-sparse/arch/xen/kernel/head.S
index 2d9379a15b..2d9379a15b 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/head.S
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/head.S
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/i386_ksyms.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/i386_ksyms.c
index 034b39d859..8b72e44f12 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/i386_ksyms.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/i386_ksyms.c
@@ -138,6 +138,10 @@ EXPORT_SYMBOL(smp_call_function);
 
 /* TLB flushing */
 EXPORT_SYMBOL(flush_tlb_page);
+
+/* HT support */
+EXPORT_SYMBOL(smp_num_siblings);
+EXPORT_SYMBOL(cpu_sibling_map);
 #endif
 
 #ifdef CONFIG_X86_IO_APIC
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/ioport.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/ioport.c
index fc0164045f..fc0164045f 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/ioport.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/ioport.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/irq.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/irq.c
index 07dad7e8ca..07dad7e8ca 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/irq.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/irq.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/ldt.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/ldt.c
index 6a2bd7a0d9..6a2bd7a0d9 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/ldt.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/ldt.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-dma.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/pci-dma.c
index dd8842719e..dd8842719e 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-dma.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/pci-dma.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-pc.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/pci-pc.c
index 48dcecd6ec..48dcecd6ec 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/pci-pc.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/pci-pc.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/process.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/process.c
index 1ef8521fcb..1ef8521fcb 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/process.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/process.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/setup.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/setup.c
index 6be85db7f1..6be85db7f1 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/setup.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/setup.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/signal.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/signal.c
index f646c5c0ca..f646c5c0ca 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/signal.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/signal.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/time.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/time.c
index 52920cd0fc..52920cd0fc 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/time.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/time.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/kernel/traps.c b/xenolinux-2.4.26-sparse/arch/xen/kernel/traps.c
index b98e0cc6bb..b98e0cc6bb 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/kernel/traps.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/kernel/traps.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/lib/Makefile b/xenolinux-2.4.26-sparse/arch/xen/lib/Makefile
index 5e00fdc135..5e00fdc135 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/lib/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/lib/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/lib/delay.c b/xenolinux-2.4.26-sparse/arch/xen/lib/delay.c
index 0035bed074..0035bed074 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/lib/delay.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/lib/delay.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/lib/xen_proc.c b/xenolinux-2.4.26-sparse/arch/xen/lib/xen_proc.c
index 9c06dcdd89..9c06dcdd89 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/lib/xen_proc.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/lib/xen_proc.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/mm/Makefile b/xenolinux-2.4.26-sparse/arch/xen/mm/Makefile
index d0d16114b6..d0d16114b6 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/mm/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/mm/Makefile
diff --git a/xenolinux-2.4.25-sparse/arch/xen/mm/fault.c b/xenolinux-2.4.26-sparse/arch/xen/mm/fault.c
index 496e974487..496e974487 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/mm/fault.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/mm/fault.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/mm/hypervisor.c b/xenolinux-2.4.26-sparse/arch/xen/mm/hypervisor.c
index 39f6863d66..39f6863d66 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/mm/hypervisor.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/mm/hypervisor.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/mm/init.c b/xenolinux-2.4.26-sparse/arch/xen/mm/init.c
index 6bfdd3ae9f..30a9e45c91 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/mm/init.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/mm/init.c
@@ -393,7 +393,17 @@ void __init mem_init(void)
 
     if (!mem_map)
         BUG();
-	
+
+#ifdef CONFIG_HIGHMEM
+    /* check that fixmap and pkmap do not overlap */
+    if (PKMAP_BASE+LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) {
+	printk(KERN_ERR "fixmap and kmap areas overlap - this will crash\n");
+	printk(KERN_ERR "pkstart: %lxh pkend: %lxh fixstart %lxh\n",
+	       PKMAP_BASE, PKMAP_BASE+LAST_PKMAP*PAGE_SIZE, FIXADDR_START);
+	BUG();
+    }
+#endif
+
     set_max_mapnr_init();
 
     high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
diff --git a/xenolinux-2.4.25-sparse/arch/xen/mm/ioremap.c b/xenolinux-2.4.26-sparse/arch/xen/mm/ioremap.c
index 7b1162de9c..7b1162de9c 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/mm/ioremap.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/mm/ioremap.c
diff --git a/xenolinux-2.4.25-sparse/arch/xen/vmlinux.lds b/xenolinux-2.4.26-sparse/arch/xen/vmlinux.lds
index 7c4c4f8e9c..7c4c4f8e9c 100644
--- a/xenolinux-2.4.25-sparse/arch/xen/vmlinux.lds
+++ b/xenolinux-2.4.26-sparse/arch/xen/vmlinux.lds
diff --git a/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c b/xenolinux-2.4.26-sparse/drivers/block/ll_rw_blk.c
index 8092d5fe7d..20a934addd 100644
--- a/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c
+++ b/xenolinux-2.4.26-sparse/drivers/block/ll_rw_blk.c
@@ -942,6 +942,15 @@ static void attempt_merge(request_queue_t * q,
 		return;
 
 	q->elevator.elevator_merge_req_fn(req, next);
+	
+	/* At this point we have either done a back merge
+	 * or front merge. We need the smaller start_time of
+	 * the merged requests to be the current request
+	 * for accounting purposes.
+	 */
+	if (time_after(req->start_time, next->start_time))
+		req->start_time = next->start_time;
+		
 	req->bhtail->b_reqnext = next->bh;
 	req->bhtail = next->bhtail;
 	req->nr_sectors = req->hard_nr_sectors += next->hard_nr_sectors;
diff --git a/xenolinux-2.4.25-sparse/drivers/char/mem.c b/xenolinux-2.4.26-sparse/drivers/char/mem.c
index dbc10d6382..dbc10d6382 100644
--- a/xenolinux-2.4.25-sparse/drivers/char/mem.c
+++ b/xenolinux-2.4.26-sparse/drivers/char/mem.c
diff --git a/xenolinux-2.4.25-sparse/drivers/char/tty_io.c b/xenolinux-2.4.26-sparse/drivers/char/tty_io.c
index b3d0fb4397..53fb06b465 100644
--- a/xenolinux-2.4.25-sparse/drivers/char/tty_io.c
+++ b/xenolinux-2.4.26-sparse/drivers/char/tty_io.c
@@ -2255,7 +2255,7 @@ void __init console_init(void)
 	au1x00_serial_console_init();
 #endif
 #ifdef CONFIG_SERIAL_CONSOLE
-#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
+#if (defined(CONFIG_8xx) || defined(CONFIG_CPM2))
 	console_8xx_init();
 #elif defined(CONFIG_MAC_SERIAL) && defined(CONFIG_SERIAL)
 	if (_machine == _MACH_Pmac)
@@ -2444,7 +2444,7 @@ void __init tty_init(void)
 #ifdef CONFIG_SPECIALIX
 	specialix_init();
 #endif
-#if (defined(CONFIG_8xx) || defined(CONFIG_8260))
+#if (defined(CONFIG_8xx) || defined(CONFIG_CPM2))
 	rs_8xx_init();
 #endif /* CONFIG_8xx */
 	pty_init();
diff --git a/xenolinux-2.4.25-sparse/fs/exec.c b/xenolinux-2.4.26-sparse/fs/exec.c
index 16dc3193bf..16dc3193bf 100644
--- a/xenolinux-2.4.25-sparse/fs/exec.c
+++ b/xenolinux-2.4.26-sparse/fs/exec.c
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/bugs.h b/xenolinux-2.4.26-sparse/include/asm-xen/bugs.h
index c46b6a0b15..c46b6a0b15 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/bugs.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/bugs.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/ctrl_if.h b/xenolinux-2.4.26-sparse/include/asm-xen/ctrl_if.h
index 9d12487144..9d12487144 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/ctrl_if.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/ctrl_if.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/desc.h b/xenolinux-2.4.26-sparse/include/asm-xen/desc.h
index 33309a9671..33309a9671 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/desc.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/desc.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/evtchn.h b/xenolinux-2.4.26-sparse/include/asm-xen/evtchn.h
index ececad9447..ececad9447 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/evtchn.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/evtchn.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/fixmap.h b/xenolinux-2.4.26-sparse/include/asm-xen/fixmap.h
index 338bd4ba2c..338bd4ba2c 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/fixmap.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/fixmap.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/highmem.h b/xenolinux-2.4.26-sparse/include/asm-xen/highmem.h
index 25ef32882c..25ef32882c 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/highmem.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/highmem.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/hw_irq.h b/xenolinux-2.4.26-sparse/include/asm-xen/hw_irq.h
index d99d15bd24..d99d15bd24 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/hw_irq.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/hw_irq.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/hypervisor.h b/xenolinux-2.4.26-sparse/include/asm-xen/hypervisor.h
index e20f67e651..e20f67e651 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/hypervisor.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/hypervisor.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/io.h b/xenolinux-2.4.26-sparse/include/asm-xen/io.h
index 3d78e20950..3d78e20950 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/io.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/io.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/irq.h b/xenolinux-2.4.26-sparse/include/asm-xen/irq.h
index 668195e9ca..668195e9ca 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/irq.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/irq.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/keyboard.h b/xenolinux-2.4.26-sparse/include/asm-xen/keyboard.h
index 9066a3bada..9066a3bada 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/keyboard.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/keyboard.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/mmu_context.h b/xenolinux-2.4.26-sparse/include/asm-xen/mmu_context.h
index 7972ce7d74..7972ce7d74 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/mmu_context.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/mmu_context.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/msr.h b/xenolinux-2.4.26-sparse/include/asm-xen/msr.h
index 1a2c8765a8..1a2c8765a8 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/msr.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/msr.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/multicall.h b/xenolinux-2.4.26-sparse/include/asm-xen/multicall.h
index f0ea5c3a66..f0ea5c3a66 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/multicall.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/multicall.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/page.h b/xenolinux-2.4.26-sparse/include/asm-xen/page.h
index b7640a7d78..b7640a7d78 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/page.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/page.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/pgalloc.h b/xenolinux-2.4.26-sparse/include/asm-xen/pgalloc.h
index 308a1b7c40..308a1b7c40 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/pgalloc.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/pgalloc.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/pgtable-2level.h b/xenolinux-2.4.26-sparse/include/asm-xen/pgtable-2level.h
index c780f644c0..c780f644c0 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/pgtable-2level.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/pgtable-2level.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/pgtable.h b/xenolinux-2.4.26-sparse/include/asm-xen/pgtable.h
index 38721e4cff..38721e4cff 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/pgtable.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/pgtable.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/proc_cmd.h b/xenolinux-2.4.26-sparse/include/asm-xen/proc_cmd.h
index 4ce2930daa..4ce2930daa 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/proc_cmd.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/proc_cmd.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/processor.h b/xenolinux-2.4.26-sparse/include/asm-xen/processor.h
index 2b290252be..2b290252be 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/processor.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/processor.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/ptrace.h b/xenolinux-2.4.26-sparse/include/asm-xen/ptrace.h
index 4457ac0b17..4457ac0b17 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/ptrace.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/ptrace.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/segment.h b/xenolinux-2.4.26-sparse/include/asm-xen/segment.h
index ca13028ce0..ca13028ce0 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/segment.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/segment.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/smp.h b/xenolinux-2.4.26-sparse/include/asm-xen/smp.h
index 804b93c332..804b93c332 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/smp.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/smp.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/suspend.h b/xenolinux-2.4.26-sparse/include/asm-xen/suspend.h
index 0a9c8e74a9..0a9c8e74a9 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/suspend.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/suspend.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/synch_bitops.h b/xenolinux-2.4.26-sparse/include/asm-xen/synch_bitops.h
index 8093de0ac9..8093de0ac9 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/synch_bitops.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/synch_bitops.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/system.h b/xenolinux-2.4.26-sparse/include/asm-xen/system.h
index 6a8e352ac5..6a8e352ac5 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/system.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/system.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/vga.h b/xenolinux-2.4.26-sparse/include/asm-xen/vga.h
index d0624cf480..d0624cf480 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/vga.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/vga.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/xen_proc.h b/xenolinux-2.4.26-sparse/include/asm-xen/xen_proc.h
index d62791e95c..d62791e95c 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/xen_proc.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/xen_proc.h
diff --git a/xenolinux-2.4.25-sparse/include/asm-xen/xor.h b/xenolinux-2.4.26-sparse/include/asm-xen/xor.h
index 9e6cca8a8a..9e6cca8a8a 100644
--- a/xenolinux-2.4.25-sparse/include/asm-xen/xor.h
+++ b/xenolinux-2.4.26-sparse/include/asm-xen/xor.h
diff --git a/xenolinux-2.4.25-sparse/include/linux/blk.h b/xenolinux-2.4.26-sparse/include/linux/blk.h
index e7c7575454..e7c7575454 100644
--- a/xenolinux-2.4.25-sparse/include/linux/blk.h
+++ b/xenolinux-2.4.26-sparse/include/linux/blk.h
diff --git a/xenolinux-2.4.25-sparse/include/linux/major.h b/xenolinux-2.4.26-sparse/include/linux/major.h
index f311bd4a9d..f311bd4a9d 100644
--- a/xenolinux-2.4.25-sparse/include/linux/major.h
+++ b/xenolinux-2.4.26-sparse/include/linux/major.h
diff --git a/xenolinux-2.4.25-sparse/include/linux/sched.h b/xenolinux-2.4.26-sparse/include/linux/sched.h
index 1ac29aa143..1ac29aa143 100644
--- a/xenolinux-2.4.25-sparse/include/linux/sched.h
+++ b/xenolinux-2.4.26-sparse/include/linux/sched.h
diff --git a/xenolinux-2.4.25-sparse/include/linux/sunrpc/debug.h b/xenolinux-2.4.26-sparse/include/linux/sunrpc/debug.h
index 67dbfb887e..67dbfb887e 100644
--- a/xenolinux-2.4.25-sparse/include/linux/sunrpc/debug.h
+++ b/xenolinux-2.4.26-sparse/include/linux/sunrpc/debug.h
diff --git a/xenolinux-2.4.25-sparse/include/linux/timer.h b/xenolinux-2.4.26-sparse/include/linux/timer.h
index 238083218f..238083218f 100644
--- a/xenolinux-2.4.25-sparse/include/linux/timer.h
+++ b/xenolinux-2.4.26-sparse/include/linux/timer.h
diff --git a/xenolinux-2.4.25-sparse/init/do_mounts.c b/xenolinux-2.4.26-sparse/init/do_mounts.c
index 6d09888fc8..6d09888fc8 100644
--- a/xenolinux-2.4.25-sparse/init/do_mounts.c
+++ b/xenolinux-2.4.26-sparse/init/do_mounts.c
diff --git a/xenolinux-2.4.25-sparse/kernel/time.c b/xenolinux-2.4.26-sparse/kernel/time.c
index b4f8b55e8a..b4f8b55e8a 100644
--- a/xenolinux-2.4.25-sparse/kernel/time.c
+++ b/xenolinux-2.4.26-sparse/kernel/time.c
diff --git a/xenolinux-2.4.25-sparse/kernel/timer.c b/xenolinux-2.4.26-sparse/kernel/timer.c
index 567794ab26..567794ab26 100644
--- a/xenolinux-2.4.25-sparse/kernel/timer.c
+++ b/xenolinux-2.4.26-sparse/kernel/timer.c
diff --git a/xenolinux-2.4.25-sparse/mkbuildtree b/xenolinux-2.4.26-sparse/mkbuildtree
index 46fe4784ad..46fe4784ad 100755
--- a/xenolinux-2.4.25-sparse/mkbuildtree
+++ b/xenolinux-2.4.26-sparse/mkbuildtree
diff --git a/xenolinux-2.4.25-sparse/mm/highmem.c b/xenolinux-2.4.26-sparse/mm/highmem.c
index a68937452c..a68937452c 100644
--- a/xenolinux-2.4.25-sparse/mm/highmem.c
+++ b/xenolinux-2.4.26-sparse/mm/highmem.c
diff --git a/xenolinux-2.4.25-sparse/mm/memory.c b/xenolinux-2.4.26-sparse/mm/memory.c
index 312dbfa7c0..312dbfa7c0 100644
--- a/xenolinux-2.4.25-sparse/mm/memory.c
+++ b/xenolinux-2.4.26-sparse/mm/memory.c
diff --git a/xenolinux-2.4.25-sparse/mm/mprotect.c b/xenolinux-2.4.26-sparse/mm/mprotect.c
index 9d2ed3c24c..9d2ed3c24c 100644
--- a/xenolinux-2.4.25-sparse/mm/mprotect.c
+++ b/xenolinux-2.4.26-sparse/mm/mprotect.c
diff --git a/xenolinux-2.4.25-sparse/mm/mremap.c b/xenolinux-2.4.26-sparse/mm/mremap.c
index 517854c86c..965afa3805 100644
--- a/xenolinux-2.4.25-sparse/mm/mremap.c
+++ b/xenolinux-2.4.26-sparse/mm/mremap.c
@@ -77,12 +77,16 @@ static inline int copy_one_pte(struct mm_struct *mm, pte_t * src, pte_t * dst)
 static int move_one_page(struct mm_struct *mm, unsigned long old_addr, unsigned long new_addr)
 {
 	int error = 0;
-	pte_t * src;
+	pte_t * src, * dst;
 
 	spin_lock(&mm->page_table_lock);
 	src = get_one_pte(mm, old_addr);
-	if (src)
-		error = copy_one_pte(mm, src, alloc_one_pte(mm, new_addr));
+	if (src) {
+		dst = alloc_one_pte(mm, new_addr);
+		src = get_one_pte(mm, old_addr);
+		if (src) 
+			error = copy_one_pte(mm, src, dst);
+	}
 	spin_unlock(&mm->page_table_lock);
 	return error;
 }
diff --git a/xenolinux-2.4.25-sparse/mm/swapfile.c b/xenolinux-2.4.26-sparse/mm/swapfile.c
index 8345e27146..8345e27146 100644
--- a/xenolinux-2.4.25-sparse/mm/swapfile.c
+++ b/xenolinux-2.4.26-sparse/mm/swapfile.c
diff --git a/xenolinux-2.4.25-sparse/mm/vmalloc.c b/xenolinux-2.4.26-sparse/mm/vmalloc.c
index dc1c7fe550..4d583b54a7 100644
--- a/xenolinux-2.4.25-sparse/mm/vmalloc.c
+++ b/xenolinux-2.4.26-sparse/mm/vmalloc.c
@@ -159,8 +159,8 @@ static inline int __vmalloc_area_pages (unsigned long address,
 					struct page ***pages)
 {
 	pgd_t * dir;
+	unsigned long start = address;
 	unsigned long end = address + size;
-	int ret;
 
 	dir = pgd_offset_k(address);
 	spin_lock(&init_mm.page_table_lock);
@@ -168,22 +168,24 @@ static inline int __vmalloc_area_pages (unsigned long address,
 		pmd_t *pmd;
 		
 		pmd = pmd_alloc(&init_mm, dir, address);
-		ret = -ENOMEM;
 		if (!pmd)
-			break;
+			goto err;
 
-		ret = -ENOMEM;
 		if (alloc_area_pmd(pmd, address, end - address, gfp_mask, prot, pages))
-			break;
+			goto err;	// The kernel NEVER reclaims pmds, so no need to undo pmd_alloc() here
 
 		address = (address + PGDIR_SIZE) & PGDIR_MASK;
 		dir++;
-
-		ret = 0;
 	} while (address && (address < end));
 	spin_unlock(&init_mm.page_table_lock);
 	flush_cache_all();
-	return ret;
+	return 0;
+err:
+	spin_unlock(&init_mm.page_table_lock);
+	flush_cache_all();
+	if (address > start)
+		vmfree_area_pages(start, address - start);
+	return -ENOMEM;
 }
 
 int vmalloc_area_pages(unsigned long address, unsigned long size,
@@ -234,7 +236,7 @@ out:
 	return NULL;
 }
 
-void vfree(void * addr)
+void __vfree(void * addr, int free_area_pages)
 {
 	struct vm_struct **p, *tmp;
 
@@ -253,7 +255,8 @@ void vfree(void * addr)
 				zap_page_range(&init_mm, VMALLOC_VMADDR(tmp->addr), tmp->size);
 			else
 #endif
-			vmfree_area_pages(VMALLOC_VMADDR(tmp->addr), tmp->size);
+			if (free_area_pages)
+			    vmfree_area_pages(VMALLOC_VMADDR(tmp->addr), tmp->size);
 			write_unlock(&vmlist_lock);
 			kfree(tmp);
 			return;
@@ -263,6 +266,11 @@ void vfree(void * addr)
 	printk(KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n", addr);
 }
 
+void vfree(void * addr)
+{
+	__vfree(addr,1);
+}
+
 void * __vmalloc (unsigned long size, int gfp_mask, pgprot_t prot)
 {
 	void * addr;
@@ -277,7 +285,7 @@ void * __vmalloc (unsigned long size, int gfp_mask, pgprot_t prot)
 	addr = area->addr;
 	if (__vmalloc_area_pages(VMALLOC_VMADDR(addr), size, gfp_mask,
 				 prot, NULL)) {
-		vfree(addr);
+		__vfree(addr, 0);
 		return NULL;
 	}
 	return addr;
@@ -299,7 +307,7 @@ void * vmap(struct page **pages, int count,
 	addr = area->addr;
 	if (__vmalloc_area_pages(VMALLOC_VMADDR(addr), size, 0,
 				 prot, &pages)) {
-		vfree(addr);
+		__vfree(addr, 0);
 		return NULL;
 	}
 	return addr;