bitkeeper revision 1.735 (4035ec37QrObBVUp0-0jtnp646Qg3g)

xenolinux-sparse:
  new file
Many files:
  Port to linux-2.4.25
.del-xenolinux-sparse~6c1e6e8b9138ffe9:
  Delete: xenolinux-sparse
Many files:
  mvdir

88 files changed, 633 insertions, 341 deletions

diff --git a/.hg-to-bk b/.hg-to-bk
index 71ef2c474b..3b63679d35 100755
--- a/.hg-to-bk
+++ b/.hg-to-bk
@@ -1,5 +1,5 @@
 #!/bin/sh -x
 set -e
-ln -s xenolinux-2.4.24-sparse xenolinux-sparse
+ln -s xenolinux-2.4.25-sparse xenolinux-sparse
 (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
 exit 0
diff --git a/.rootkeys b/.rootkeys
index 227493e410..bd163ff5e1 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -507,90 +507,90 @@
 3eb3c87fmKYTC5GCh_rydFakZp9ayw xen/tools/figlet/README
 3eb3c87fdQKQ5OBGbM-KjZfi9Us4ng xen/tools/figlet/figlet.c
 3eb3c87fS7DNbg0i6yhFs28UIqAK5g xen/tools/figlet/xen.flf
-3f05a939TA3SLPY7ZiScMotLjg9owQ xenolinux-2.4.24-sparse/Documentation/Configure.help
-3e5a4e6589G-U42lFKs43plskXoFxQ xenolinux-2.4.24-sparse/Makefile
-3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg xenolinux-2.4.24-sparse/arch/xeno/Makefile
-3e5a4e65n-KhsEAs-A4ULiStBp-r6w xenolinux-2.4.24-sparse/arch/xeno/boot/Makefile
-3e5a4e65OV_j_DBtjzt5vej771AJsA xenolinux-2.4.24-sparse/arch/xeno/config.in
-3e5a4e65TNEycLeXqPSXQJQm_xGecA xenolinux-2.4.24-sparse/arch/xeno/defconfig
-3e6377f5xwPfYZkPHPrDbEq1PRN7uQ xenolinux-2.4.24-sparse/arch/xeno/drivers/balloon/Makefile
-3e6377f8Me8IqtvEhb70XFgOvqQH7A xenolinux-2.4.24-sparse/arch/xeno/drivers/balloon/balloon.c
-3e5a4e65iHEuC5sjFhj42XALYbLVRw xenolinux-2.4.24-sparse/arch/xeno/drivers/block/Makefile
-3e5a4e65pP5spJErBW69pJxSSdK9RA xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_block.c
-3e67f822FOPwqHiaRKbrskgWgoNL5g xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_block.h
-3e676eb5RXnHzSHgA1BvM0B1aIm4qg xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
-3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ xenolinux-2.4.24-sparse/arch/xeno/drivers/console/Makefile
-3e5a4e651TH-SXHoufurnWjgl5bfOA xenolinux-2.4.24-sparse/arch/xeno/drivers/console/console.c
-3e5a4e656nfFISThfbyXQOA6HN6YHw xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/Makefile
-3e5a4e65BXtftInNHUC2PjDfPhdZZA xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/dom0_core.c
-3e5a4e65gfn_ltB8ujHMVFApnTTNRQ xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/vfr.c
-3e5a4e65gZBRBB6RsSVg1c9iahigAw xenolinux-2.4.24-sparse/arch/xeno/drivers/network/Makefile
-3e5a4e65ZxKrbFetVB84JhrTyZ1YuQ xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c
-3e5a4e65lWzkiPXsZdzPt2RNnJGG1g xenolinux-2.4.24-sparse/arch/xeno/kernel/Makefile
-3e5a4e65_hqfuxtGG8IUy6wRM86Ecg xenolinux-2.4.24-sparse/arch/xeno/kernel/entry.S
-3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg xenolinux-2.4.24-sparse/arch/xeno/kernel/head.S
-3e5a4e65ibVQmwlOn0j3sVH_j_6hAg xenolinux-2.4.24-sparse/arch/xeno/kernel/hypervisor.c
-3e5a4e65RMGcuA-HCn3-wNx3fFQwdg xenolinux-2.4.24-sparse/arch/xeno/kernel/i386_ksyms.c
-3e5a4e65MEvZhlr070sK5JsfAQlv7Q xenolinux-2.4.24-sparse/arch/xeno/kernel/ioport.c
-3e5a4e653U6cELGv528IxOLHvCq8iA xenolinux-2.4.24-sparse/arch/xeno/kernel/irq.c
-3e5a4e65muT6SU3ck47IP87Q7Ti5hA xenolinux-2.4.24-sparse/arch/xeno/kernel/ldt.c
-3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ xenolinux-2.4.24-sparse/arch/xeno/kernel/process.c
-3e5a4e66tR-qJMLj3MppcKqmvuI2XQ xenolinux-2.4.24-sparse/arch/xeno/kernel/setup.c
-3e5a4e66fWSTagLGU2P8BGFGRjhDiw xenolinux-2.4.24-sparse/arch/xeno/kernel/signal.c
-3e5a4e66N__lUXNwzQ-eADRzK9LXuQ xenolinux-2.4.24-sparse/arch/xeno/kernel/time.c
-3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ xenolinux-2.4.24-sparse/arch/xeno/kernel/traps.c
-3e5a4e66-9_NczrVMbuQkoSLyXckIw xenolinux-2.4.24-sparse/arch/xeno/lib/Makefile
-3e5a4e6637ZDk0BvFEC-aFQs599-ng xenolinux-2.4.24-sparse/arch/xeno/lib/delay.c
-3f68905cF5i8-NYpIhGjKmh0y8Gu5g xenolinux-2.4.24-sparse/arch/xeno/lib/xeno_proc.c
-3e5a4e66croVgpcJyJuF2ycQw0HuJw xenolinux-2.4.24-sparse/arch/xeno/mm/Makefile
-3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg xenolinux-2.4.24-sparse/arch/xeno/mm/fault.c
-3e5a4e668SE9rixq4ahho9rNhLUUFQ xenolinux-2.4.24-sparse/arch/xeno/mm/hypervisor.c
-3e5a4e661gLzzff25pJooKIIWe7IWg xenolinux-2.4.24-sparse/arch/xeno/mm/init.c
-3f0bed43UUdQichXAiVNrjV-y2Kzcg xenolinux-2.4.24-sparse/arch/xeno/mm/ioremap.c
-3e5a4e66qRlSTcjafidMB6ulECADvg xenolinux-2.4.24-sparse/arch/xeno/vmlinux.lds
-3e5a4e66mrtlmV75L1tjKDg8RaM5gA xenolinux-2.4.24-sparse/drivers/block/ll_rw_blk.c
-3f108aeaLcGDgQdFAANLTUEid0a05w xenolinux-2.4.24-sparse/drivers/char/mem.c
-3e5a4e66rw65CxyolW9PKz4GG42RcA xenolinux-2.4.24-sparse/drivers/char/tty_io.c
-3e5a4e669uzIE54VwucPYtGwXLAbzA xenolinux-2.4.24-sparse/fs/exec.c
-3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.24-sparse/include/asm-xeno/bugs.h
-3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.24-sparse/include/asm-xeno/desc.h
-3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw xenolinux-2.4.24-sparse/include/asm-xeno/fixmap.h
-3e5a4e67w_DWgjIJ17Tlossu1LGujQ xenolinux-2.4.24-sparse/include/asm-xeno/highmem.h
-3e5a4e67YtcyDLQsShhCfQwPSELfvA xenolinux-2.4.24-sparse/include/asm-xeno/hw_irq.h
-3e5a4e677VBavzM1UZIEcH1B-RlXMA xenolinux-2.4.24-sparse/include/asm-xeno/hypervisor.h
-3e5a4e673p7PEOyHFm3nHkYX6HQYBg xenolinux-2.4.24-sparse/include/asm-xeno/irq.h
-3ead095db_LRUXnxaqs0dA1DWhPoQQ xenolinux-2.4.24-sparse/include/asm-xeno/keyboard.h
-3e5a4e678ddsQOpbSiRdy1GRcDc9WA xenolinux-2.4.24-sparse/include/asm-xeno/mmu_context.h
-3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ xenolinux-2.4.24-sparse/include/asm-xeno/msr.h
-3e7270deQqtGPSnFxcW4AvJZuTUWfg xenolinux-2.4.24-sparse/include/asm-xeno/multicall.h
-3e5a4e67mnQfh-R8KcQCaVo2Oho6yg xenolinux-2.4.24-sparse/include/asm-xeno/page.h
-3e5a4e67uTYU5oEnIDjxuaez8njjqg xenolinux-2.4.24-sparse/include/asm-xeno/pgalloc.h
-3e5a4e67X7JyupgdYkgDX19Huj2sAw xenolinux-2.4.24-sparse/include/asm-xeno/pgtable-2level.h
-3e5a4e67gr4NLGtQ5CvSLimMYZlkOA xenolinux-2.4.24-sparse/include/asm-xeno/pgtable.h
-3f108af1qNv8DVSGPv4zpqIU1txCkg xenolinux-2.4.24-sparse/include/asm-xeno/proc_cmd.h
-3e5a4e676uK4xErTBDH6XJREn9LSyg xenolinux-2.4.24-sparse/include/asm-xeno/processor.h
-3e5a4e67AJPjW-zL7p-xWuA6IVeH1g xenolinux-2.4.24-sparse/include/asm-xeno/ptrace.h
-3e5a4e68uJz-xI0IBVMD7xRLQKJDFg xenolinux-2.4.24-sparse/include/asm-xeno/segment.h
-3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA xenolinux-2.4.24-sparse/include/asm-xeno/smp.h
-3fa8e3f0kBLeE4To2vpdi3cpJbIkbQ xenolinux-2.4.24-sparse/include/asm-xeno/suspend.h
-3e5a4e68mTr0zcp9SXDbnd-XLrrfxw xenolinux-2.4.24-sparse/include/asm-xeno/system.h
-3f1056a9L_kqHcFheV00KbKBzv9j5w xenolinux-2.4.24-sparse/include/asm-xeno/vga.h
-3f689063nhrIRsMMZjZxMFk7iEINqQ xenolinux-2.4.24-sparse/include/asm-xeno/xeno_proc.h
-3f056927gMHl7mWB89rb73JahbhQIA xenolinux-2.4.24-sparse/include/linux/blk.h
-3e5a4e68WLX3B8owTvktP3HHOtznPQ xenolinux-2.4.24-sparse/include/linux/major.h
-401c0590D_kwJDU59X8NyvqSv_Cl2A xenolinux-2.4.24-sparse/include/linux/sched.h
-3e5a4e686V0nioX2ZpFf056sgvdiQw xenolinux-2.4.24-sparse/include/linux/sunrpc/debug.h
-401c0592pLrp_aCbQRo9GXiYQQaVVA xenolinux-2.4.24-sparse/include/linux/timer.h
-3e5a4e68W_hpMlM3u_-QOKMp3gzcwQ xenolinux-2.4.24-sparse/init/do_mounts.c
-3e5a4e68TJJavrunYwTAnLRSBxSYqQ xenolinux-2.4.24-sparse/kernel/panic.c
-3f1056a9LXNTgSzITNh1mb-MIKV1Ng xenolinux-2.4.24-sparse/kernel/printk.c
-3f9d4b44247udoqWEgFkaHiWv6Uvyg xenolinux-2.4.24-sparse/kernel/time.c
-401c059bjLBFYHRD4Py2uM3eA1D4zQ xenolinux-2.4.24-sparse/kernel/timer.c
-3eba8f878XjouY21EkQBXwYBsPsipQ xenolinux-2.4.24-sparse/lndir-rel
-3e6e7c1efbQe93xCvOpOVCnXTMmQ5w xenolinux-2.4.24-sparse/mkbuildtree
-3e5a4e68GxCIaFH4sy01v1wjapetaA xenolinux-2.4.24-sparse/mm/memory.c
-3f108af5VxPkLv13tXpXgoRKALQtXQ xenolinux-2.4.24-sparse/mm/mprotect.c
-3e5a4e681xMPdF9xCMwpyfuYMySU5g xenolinux-2.4.24-sparse/mm/mremap.c
-3e5a4e683HKVU-sxtagrDasRB8eBVw xenolinux-2.4.24-sparse/mm/swapfile.c
-3f108af81Thhb242EmKjGCYkjx-GJA xenolinux-2.4.24-sparse/mm/vmalloc.c
-40026087QHbrW3n3XbK2U-hilL-K2g xenolinux-sparse
+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/xl_block.c
+3e67f822FOPwqHiaRKbrskgWgoNL5g xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.h
+3e676eb5RXnHzSHgA1BvM0B1aIm4qg xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_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/dom0_core.c
+3e5a4e65gfn_ltB8ujHMVFApnTTNRQ xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/vfr.c
+3e5a4e65gZBRBB6RsSVg1c9iahigAw xenolinux-2.4.25-sparse/arch/xeno/drivers/network/Makefile
+3e5a4e65ZxKrbFetVB84JhrTyZ1YuQ xenolinux-2.4.25-sparse/arch/xeno/drivers/network/network.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
+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
+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
+3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.25-sparse/include/asm-xeno/desc.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
+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
+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
+3e5a4e68TJJavrunYwTAnLRSBxSYqQ xenolinux-2.4.25-sparse/kernel/panic.c
+3f1056a9LXNTgSzITNh1mb-MIKV1Ng xenolinux-2.4.25-sparse/kernel/printk.c
+3f9d4b44247udoqWEgFkaHiWv6Uvyg xenolinux-2.4.25-sparse/kernel/time.c
+401c059bjLBFYHRD4Py2uM3eA1D4zQ xenolinux-2.4.25-sparse/kernel/timer.c
+3eba8f878XjouY21EkQBXwYBsPsipQ xenolinux-2.4.25-sparse/lndir-rel
+3e6e7c1efbQe93xCvOpOVCnXTMmQ5w xenolinux-2.4.25-sparse/mkbuildtree
+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
diff --git a/xenolinux-2.4.24-sparse/Documentation/Configure.help b/xenolinux-2.4.25-sparse/Documentation/Configure.help
index cf0e01c9c4..84676592c8 100644
--- a/xenolinux-2.4.24-sparse/Documentation/Configure.help
+++ b/xenolinux-2.4.25-sparse/Documentation/Configure.help
@@ -412,6 +412,20 @@ CONFIG_HIGHIO
   Otherwise low memory pages are used as bounce buffers causing a
   degrade in performance.
 
+OOM killer support
+CONFIG_OOM_KILLER
+   This option selects the kernel behaviour during total out of memory
+   condition. 
+
+   The default behaviour is to, as soon as no freeable memory and no swap
+   space are available, kill the task which tries to allocate memory. 
+   The default behaviour is very reliable.
+
+   If you select this option, as soon as no freeable memory is available, 
+   the kernel will try to select the "best" task to be killed.
+
+   If unsure, say N.
+
 Normal floppy disk support
 CONFIG_BLK_DEV_FD
   If you want to use the floppy disk drive(s) of your PC under Linux,
@@ -1493,12 +1507,15 @@ CONFIG_BLK_DEV_UMC8672
 
 Amiga Gayle IDE interface support
 CONFIG_BLK_DEV_GAYLE
-  This is the IDE driver for the builtin IDE interface on some Amiga
-  models. It supports both the `A1200 style' (used in A600 and A1200)
-  and `A4000 style' (used in A4000 and A4000T) of the Gayle IDE
-  interface. Say Y if you have such an Amiga model and want to use IDE
-  devices (hard disks, CD-ROM drives, etc.) that are connected to the
-  builtin IDE interface.
+  This is the IDE driver for the Amiga Gayle IDE interface. It supports
+  both the `A1200 style' and `A4000 style' of the Gayle IDE interface,
+  This includes builtin IDE interfaces on some Amiga models (A600,
+  A1200, A4000, and A4000T), and IDE interfaces on the Zorro expansion
+  bus (M-Tech E-Matrix 530 expansion card).
+  Say Y if you have an Amiga with a Gayle IDE interface and want to use
+  IDE devices (hard disks, CD-ROM drives, etc.) that are connected to it.
+  Note that you also have to enable Zorro bus support if you want to
+  use Gayle IDE interfaces on the Zorro expansion bus.
 
 Falcon IDE interface support
 CONFIG_BLK_DEV_FALCON_IDE
@@ -1531,12 +1548,6 @@ CONFIG_BLK_DEV_IDEDOUBLER
   Say Y if you have an IDE doubler.  The driver is enabled at kernel
   runtime using the "ide=doubler" kernel boot parameter.
 
-WarpEngine SCSI support
-CONFIG_WARPENGINE_SCSI
-  Support for MacroSystem Development's WarpEngine Amiga SCSI-2
-  controller. Info at
-  <http://www.lysator.liu.se/amiga/ar/guide/ar310.guide?FEATURE5>.
-
 Builtin PowerMac IDE support
 CONFIG_BLK_DEV_IDE_PMAC
   This driver provides support for the built-in IDE controller on
@@ -2087,7 +2098,7 @@ CONFIG_ACER_PICA_61
   This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
   kernel that runs on these, say Y here. For details about Linux on
   the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-  <http://oss.sgi.com/mips/>.
+  <http://www.linux-mips.org/>.
 
 Support for Algorithmics P4032 (EXPERIMENTAL)
 CONFIG_ALGOR_P4032
@@ -2110,7 +2121,7 @@ Support for BAGET MIPS series
 CONFIG_BAGET_MIPS
   This enables support for the Baget, a Russian embedded system.  For
   more details about the Baget see the Linux/MIPS FAQ on
-  <http://oss.sgi.com/mips/>.
+  <http://www.linux-mips.org/>.
 
 Baget AMD LANCE support
 CONFIG_BAGETLANCE
@@ -2121,7 +2132,7 @@ CONFIG_BAGETLANCE
 Support for DECstations
 CONFIG_DECSTATION
   This enables support for DEC's MIPS based workstations.  For details
-  see the Linux/MIPS FAQ on <http://oss.sgi.com/mips/> and the
+  see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the
   DECstation porting pages on <http://decstation.unix-ag.org/>.
 
   If you have one of the following DECstation Models you definitely
@@ -2248,6 +2259,13 @@ CONFIG_SIBYTE_BUS_WATCHER
   Handle and keep statistics on the bus error interrupts (COR_ECC,
   BAD_ECC, IO_BUS).
 
+Bus trace dump on bus error
+CONFIG_SIBYTE_BW_TRACE
+  Run a continuous bus trace, dumping the raw data as soon as a ZBbus
+  error is detected.  Cannot work if ZBbus profiling is turned on, and
+  also will interfere with JTAG-based trace buffer activity.  Raw
+  buffer data is dumped to console, and must be processed off-line.
+
 Corelis Debugger
 CONFIG_SB1XXX_CORELIS
   Select compile flags that produce code that can be processed by the
@@ -2272,7 +2290,7 @@ CONFIG_MIPS_MAGNUM_4000
   This is a machine with a R4000 100 MHz CPU. To compile a Linux
   kernel that runs on these, say Y here. For details about Linux on
   the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-  <http://oss.sgi.com/mips/>.
+  <http://www.linux-mips.org/>.
 
 Enable Qtronix 990P Keyboard Support
 CONFIG_QTRONIX_KEYBOARD
@@ -2284,7 +2302,7 @@ CONFIG_OLIVETTI_M700
   This is a machine with a R4000 100 MHz CPU. To compile a Linux
   kernel that runs on these, say Y here. For details about Linux on
   the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-  <http://oss.sgi.com/mips/>.
+  <http://www.linux-mips.org/>.
 
 Support for SNI RM200 PCI
 CONFIG_SNI_RM200_PCI
@@ -3243,11 +3261,32 @@ CONFIG_IP6_NF_TARGET_MARK
   If you want to compile it as a module, say M here and read
   <file:Documentation/modules.txt>.  If unsure, say `N'.
 
+ARP tables support
+CONFIG_IP_NF_ARPTABLES
+  arptables is a general, extensible packet identification framework.
+  The ARP packet filtering and mangling (manipulation)subsystems
+  use this: say Y or M here if you want to use either of those.
+
+  If you want to compile it as a module, say M here and read
+  <file:Documentation/modules.txt>.  If unsure, say `N'.
+
+ARP packet filtering
+CONFIG_IP_NF_ARPFILTER
+  ARP packet filtering defines a table `filter', which has a series of
+  rules for simple ARP packet filtering at local input and
+  local output.  See the man page for arptables(8).
+
+  If you want to compile it as a module, say M here and read
+  <file:Documentation/modules.txt>.  If unsure, say `N'.
+
 ARP payload mangling
 CONFIG_IP_NF_ARP_MANGLE
   Allows altering the ARP packet payload: source and destination
   hardware and network addresses.
 
+  If you want to compile it as a module, say M here and read
+  <file:Documentation/modules.txt>.  If unsure, say `N'.
+
 TCP Explicit Congestion Notification support
 CONFIG_INET_ECN
   Explicit Congestion Notification (ECN) allows routers to notify
@@ -3896,6 +3935,24 @@ CONFIG_SGI_DS1286
   via the file /proc/rtc and its behaviour is set by various ioctls on
   /dev/rtc.
 
+Dallas DS1742 RTC Support
+CONFIG_DS1742
+  If you say Y here and create a character special file /dev/rtc with
+  major number 10 and minor number 135 using mknod ("man mknod"), you
+  will get access to the real time clock present on various Toshiba
+  MIPS-based boards. It reports status information via the file
+  /proc/driver/rtc and its behaviour is set by various ioctls on
+  /dev/rtc or /dev/misc/rtc if using devfs.
+
+  For technical information and application notes, please see the
+  Dallas Semiconductor website:
+  <http://www.dalsemi.com/quick_view2.cfm?qv_pk=2768>.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module is called ds1742.o. If you want to compile it as a module,
+  say M here and read <file:Documentation/modules.txt>.
+
 Indy/I2 Hardware Watchdog
 CONFIG_INDYDOG
   Hardwaredriver for the Indy's/I2's watchdog. This is a
@@ -4959,6 +5016,11 @@ CONFIG_FB_MAXINE
   DECstation series (Personal DECstation 5000/20, /25, /33, /50,
   Codename "Maxine").
 
+PMAG-AA TURBOchannel framebuffer support
+CONFIG_FB_PMAG_AA
+  Support for the PMAG-AA TURBOchannel framebuffer card (1280x1024x1)
+  used mainly in the MIPS-based DECstation series.
+
 PMAG-BA TURBOchannel framebuffer support
 CONFIG_FB_PMAG_BA
   Support for the PMAG-BA TURBOchannel framebuffer card (1024x864x8)
@@ -10593,6 +10655,15 @@ CONFIG_NET_SCH_HTB
   whenever you want).  If you want to compile it as a module, say M
   here and read <file:Documentation/modules.txt>.
 
+CONFIG_NET_SCH_HFSC
+  Say Y here if you want to use the Hierarchical Fair Service Curve
+  (HFSC) packet scheduling algorithm for some of your network devices.
+
+  This code is also available as a module called sch_hfsc.o ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want).  If you want to compile it as a module, say M
+  here and read <file:Documentation/modules.txt>.
+
 CSZ packet scheduler
 CONFIG_NET_SCH_CSZ
   Say Y here if you want to use the Clark-Shenker-Zhang (CSZ) packet
@@ -11122,9 +11193,6 @@ CONFIG_COMX
   You must say Y to "/proc file system support" (CONFIG_PROC_FS) to
   use this driver.
 
-  If you want to compile this as a module, say M and read
-  <file:Documentation/modules.txt>.  The module will be called comx.o.
-
 Support for COMX/CMX/HiCOMX boards
 CONFIG_COMX_HW_COMX
   Hardware driver for the 'CMX', 'COMX' and 'HiCOMX' boards from the
@@ -11318,6 +11386,39 @@ CONFIG_HDLC_X25
 
   If unsure, say N here.
 
+Cyclades-PC300 support
+CONFIG_PC300
+  This is a driver for the Cyclades-PC300 synchronous communication
+  boards. These boards provide synchronous serial interfaces to your
+  Linux box (interfaces currently available are RS-232/V.35, X.21 and
+  T1/E1). If you wish to support Multilink PPP, please select the
+  option below this one and read the file README.mlppp provided by PC300
+  package.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called pc300.o.
+
+  If you haven't heard about it, it's safe to say N.
+
+Cyclades-PC300 Sync TTY (to MLPPP) support
+CONFIG_PC300_MLPPP
+  Say 'Y' to this option if you are planning to use Multilink PPP over the
+  PC300 synchronous communication boards.
+
+CONFIG_PCI200SYN
+  This driver is for PCI200SYN cards made by Goramo sp. j.
+  If you have such a card, say Y or M here and see
+  <http://hq.pm.waw.pl/pub/hdlc/>
+
+  If you want to compile the driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read <file:Documentation/modules.txt>.  The module
+  will be called pci200syn.o.
+
+  If unsure, say N here.
+
 SDL RISCom/N2 support
 CONFIG_N2
   This driver is for RISCom/N2 single or dual channel ISA cards
@@ -11346,25 +11447,6 @@ CONFIG_C101
 
   If unsure, say N here.
 
-CONFIG_HDLC_DEBUG_PKT
-  This option is for developers only - do NOT use on production
-  systems.
-
-CONFIG_HDLC_DEBUG_HARD_HEADER
-  This option is for developers only - do NOT use on production
-  systems.
-
-CONFIG_HDLC_DEBUG_ECN
-  This option is for developers only - do NOT use on production
-  systems.
-
-CONFIG_HDLC_DEBUG_RINGS
-  If you answer Y here you will be able to get a diagnostic dump of
-  port's TX and RX packet rings, using "sethdlc hdlcX private"
-  command. It does not affect normal operations.
-
-  If unsure, say Y here.
-
 Ethernet (10 or 100Mbit)
 CONFIG_NET_ETHERNET
   Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
@@ -11712,9 +11794,11 @@ CONFIG_SK98LIN
 	    - EG1032 v2 Instant Gigabit Network Adapter
 	    - EG1064 v2 Instant Gigabit Network Adapter
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
+	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
+	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
 	    - Marvell RDK-8001 Adapter
@@ -11790,6 +11874,24 @@ CONFIG_TIGON3
   say M here and read <file:Documentation/modules.txt>.  This is
   recommended.  The module will be called tg3.o.
 
+MV-64340 Ethernet support
+CONFIG_MV64340_ETH
+  This driver supports the Marvell Discovery II MV64340 device
+  as an Ethernet controller.  Say Y here and select Port 0,1,2
+  as needed.  Otherwise, say N.
+
+MV-64340 Port 0
+CONFIG_MV64340_ETH_0
+  Enable port 0 on the MV64340 Ethernet controller.
+
+MV-64340 Port 1
+CONFIG_MV64340_ETH_1
+  Enable port 1 on the MV64340 Ethernet controller.
+
+MV-64340 Port 2
+CONFIG_MV64340_ETH_2
+  Enable port 2 on the MV64340 Ethernet controller.
+
 MyriCOM Gigabit Ethernet support
 CONFIG_MYRI_SBUS
   This driver supports MyriCOM Sbus gigabit Ethernet cards.
@@ -14373,7 +14475,7 @@ CONFIG_MTD_SLRAM
 
 DEC MS02-NV NVRAM module support
 CONFIG_MTD_MS02NV
-  This is a MTD driver for the DEC's MS02-NV (54-20948-01) battery
+  This is an MTD driver for the DEC's MS02-NV (54-20948-01) battery
   backed-up NVRAM module.  The module was originally meant as an NFS
   accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
   DECsystem 5900 equipped with such a module.
@@ -14812,6 +14914,16 @@ CONFIG_INPUT_ADBHID
 
   If unsure, say Y.
 
+HP OB600 C/CT Pop-Up Mouse
+CONFIG_OBMOUSE
+  Only add this driver if you have an Omnibook 600C or 600CT laptop.
+  This driver has no probe routine and must assume ports 0x238-23b
+  belong to the Pop-Up mouse. Depends on CONFIG_INPUT_MOUSEDEV.
+
+  Best is to use a module and load the obmouse driver at runtime.
+  Say M here and read <file:Documentation/modules.txt>.
+
+
 Input core support
 CONFIG_INPUT
   Say Y here if you want to enable any of the following options for
@@ -14878,6 +14990,15 @@ CONFIG_INPUT_EVDEV
   accessible under char device 13:64+ - /dev/input/eventX in a generic
   way.  This is the future ...
 
+CONFIG_INPUT_UINPUT
+  Say Y here if you want to support user level drivers for input
+  subsystem accessible under char device 10:223 - /dev/input/uinput.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called uinput.o.  If you want to compile it as a
+  module, say M here and read <file:Documentation/modules.txt>.	    
+
 USB Scanner support
 CONFIG_USB_SCANNER
   Say Y here if you want to connect a USB scanner to your computer's
@@ -15310,19 +15431,18 @@ CONFIG_USB_W9968CF
 
   This driver has an optional plugin, which is distributed as a
   separate module only (released under GPL). It contains code that 
-  allows you to use higher resolutions and framerates, and can't
-  be included into the official Linux kernel for performance 
-  purposes.
-  At the moment the driver needs a third-part module for the CMOS 
+  allows you to use higher resolutions and framerates, and cannot
+  be included in the official Linux kernel for performance purposes.
+  At the moment the driver needs a third-party module for the CMOS 
   sensors, which is available on internet: it is recommended to read
   <file:Documentation/usb/w9968cf.txt> for more informations and for
   a list of supported cameras.
 
   This driver uses the Video For Linux and the I2C APIs. 
-  You must say Y or M to both "Video For Linux" and 
-  "I2C Support" to use this driver.
-  Information on this API and pointers to "v4l" programs may be found
-  on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>.
+  You must say Y or M to both "Video For Linux" and "I2C Support" 
+  to use this driver. Information on this API and pointers to "v4l" 
+  programs may be found on the WWW at 
+  <http://roadrunner.swansea.uk.linux.org/v4l.shtml>.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -15517,24 +15637,6 @@ CONFIG_USB_CATC
   The module will be called catc.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
-USB ASIX AX88172 based ethernet device support
-CONFIG_USB_AX8817X
-  Say Y if you want to use one of the following 10/100 USB2 Ethernet
-  devices based on the ASIX AX88172 chip.  Supported devices are:
-    Linksys USB200M
-    Netgear FA120
-    D-Link DUB-E100
-    Hawking UF200
-
-  This driver makes the adapter appear as a normal Ethernet interface,
-  typically on eth0, if it is the only ethernet device, or perhaps on
-  eth1, if you have a PCI or ISA ethernet card installed.
-
-  This code is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called ax8817x.o. If you want to compile it as a
-  module, say M here and read <file:Documentation/modules.txt>.
-
 USB Kodak DC-2xx Camera support
 CONFIG_USB_DC2XX
   Say Y here if you want to connect this type of still camera to your
@@ -17191,6 +17293,80 @@ CONFIG_UFS_FS_WRITE
   Say Y here if you want to try writing to UFS partitions. This is
   experimental, so you should back up your UFS partitions beforehand.
 
+XFS filesystem support
+CONFIG_XFS_FS
+  XFS is a high performance journaling filesystem which originated
+  on the SGI IRIX platform.  It is completely multi-threaded, can
+  support large files and large filesystems, extended attributes,
+  variable block sizes, is extent based, and makes extensive use of
+  Btrees (directories, extents, free space) to aid both performance
+  and scalability.
+
+  Refer to the documentation at <http://oss.sgi.com/projects/xfs/>
+  for complete details.  This implementation is on-disk compatible
+  with the IRIX version of XFS.
+
+  If you want to compile this file system as a module ( = code which
+  can be inserted in and removed from the running kernel whenever you
+  want), say M here and read <file:Documentation/modules.txt>.  The
+  module will be called xfs.o.  Be aware, however, that if the file
+  system of your root partition is compiled as a module, you'll need
+  to use an initial ramdisk (initrd) to boot.
+
+Quota support
+CONFIG_XFS_QUOTA
+  If you say Y here, you will be able to set limits for disk usage on
+  a per user and/or per group basis under XFS.  XFS considers quota
+  information as filesystem metadata and uses journaling to provide a
+  higher level guarantee of consistency.  The on-disk data format for
+  quota is also compatible with the IRIX version of XFS, allowing a
+  filesystem to be migrated between Linux and IRIX without any need
+  for conversion.
+
+  If unsure, say N.  More comprehensive documentation can be found in
+  README.quota in the xfsprogs package.  XFS quota can be used either
+  with or without the generic quota support enabled (CONFIG_QUOTA) -
+  they are completely independent subsystems.
+
+Realtime support (EXPERIMENTAL)
+CONFIG_XFS_RT
+  If you say Y here you will be able to mount and use XFS filesystems
+  which contain a realtime subvolume. The realtime subvolume is a
+  separate area of disk space where only file data is stored. The
+  realtime subvolume is designed to provide very deterministic
+  data rates suitable for media streaming applications.
+
+  See the xfs man page in section 5 for a bit more information.
+
+  This feature is unsupported at this time, is not yet fully
+  functional, and may cause serious problems.
+
+  If unsure, say N.
+
+Tracing support (EXPERIMENTAL)
+CONFIG_XFS_TRACE
+  Say Y here to get an XFS build with activity tracing enabled.
+  Enabling this option will attach historical information to XFS
+  inodes, pagebufs, certain locks, the log, the IO path, and a
+  few other key areas within XFS.  These traces can be examined
+  using a kernel debugger.
+
+  Note that for the pagebuf traces, you will also have to enable
+  the sysctl in /proc/sys/vm/pagebuf/debug for this to work.
+
+  Say N unless you are an XFS developer.
+
+Debugging support (EXPERIMENTAL)
+CONFIG_XFS_DEBUG
+  Say Y here to get an XFS build with many debugging features,
+  including ASSERT checks, function wrappers around macros,
+  and extra sanity-checking functions in various code paths.
+
+  Note that the resulting code will be HUGE and SLOW, and probably
+  not useful unless you are debugging a particular problem.
+
+  Say N unless you are an XFS developer, or play one on TV.
+
 Advanced partition selection
 CONFIG_PARTITION_ADVANCED
   Say Y here if you would like to use hard disks under Linux which
@@ -17508,6 +17684,17 @@ CONFIG_SMB_NLS_REMOTE
 
   smbmount from samba 2.2.0 or later supports this.
 
+Enable Unix Extensions
+CONFIG_SMB_UNIX
+  Enabling this will make smbfs use the CIFS Unix Extensions if
+  supported by the server. These extensions allows use of unix user
+  ids, permissions, file modes, symlinks, etc that normally do not
+  work on smbfs.
+
+  Samba 3.0 servers supports these extensions.
+
+  If you don't know what all this is about, it is safe to say Y.
+
 Coda file system support (advanced network fs)
 CONFIG_CODA_FS
   Coda is an advanced network file system, similar to NFS in that it
@@ -18838,7 +19025,7 @@ CONFIG_SOUND_IT8172
   Say Y here to support the on-board sound generator on the Integrated
   Technology Express, Inc. ITE8172 SBC.  Vendor page at
   <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-  board at <http://www.mvista.com/allies/semiconductor/ite.html>.
+  board at <http://www.mvista.com/partners/semiconductor/ite.html>.
 
 I2C support
 CONFIG_I2C
@@ -18907,9 +19094,9 @@ CONFIG_I2C_ELV
   <file:Documentation/modules.txt>.
   The module will be called i2c-elv.o.
 
-Velleman K9000 adapter
+Velleman K8000 adapter
 CONFIG_I2C_VELLEMAN
-  This supports the Velleman K9000 parallel-port I2C adapter.  Say Y
+  This supports the Velleman K8000 parallel-port I2C adapter.  Say Y
   if you own such an adapter.
 
   This driver is also available as a module.  If you want to compile
@@ -18970,6 +19157,11 @@ CONFIG_I2C_MAX1617
   sensor.  Currently the device is only supported on a SiByte I2C
   adapter, and the driver prints status updates to the system log.
 
+SGI I2C Algorithm
+CONFIG_I2C_ALGO_SGI
+  Supports the SGI interfaces like the ones found on SGI Indy VINO
+  or SGI O2 MACE.
+
 I2C device interface
 CONFIG_I2C_CHARDEV
   Say Y here to use i2c-* device files, usually found in the /dev
@@ -21757,14 +21949,14 @@ CONFIG_MIPS_EV64120
   This is an evaluation board based on the Galileo GT-64120
   single-chip system controller that contains a MIPS R5000 compatible
   core running at 75/100MHz.  Their website is located at
-  <http://www.galileot.com/>.  Say Y here if you wish to build a
+  <http://www.marvell.com/>.  Say Y here if you wish to build a
   kernel for this platform.
 
 Galileo EV96100 Evaluation board
 CONFIG_MIPS_EV96100
   This is an evaluation board based on the Galielo GT-96100 LAN/WAN
   communications controllers containing a MIPS R5000 compatible core
-  running at 83MHz. Their website is <http://www.galileot.com/>. Say Y
+  running at 83MHz. Their website is <http://www.marvell.com/>. Say Y
   here if you wish to build a kernel for this platform.
 
 Support for ITE 8172G board
@@ -21780,8 +21972,8 @@ CONFIG_MIPS_IVR
   This is an evaluation board built by Globespan to showcase their
   iVR (Internet Video Recorder) design. It utilizes a QED RM5231
   R5000 MIPS core. More information can be found out their website
-  located at <http://www.globespan.net/products/product4.html>P. Say Y
-  here if you wish to build a kernel for this platform.
+  located at <http://www.globespan.net/>. Say Y here if you wish to
+  build a kernel for this platform.
 
 Support for Alchemy Semi PB1000 board
 CONFIG_MIPS_PB1000
@@ -22869,7 +23061,7 @@ CONFIG_BLUEZ_HCIUSB
   kernel or say M to compile it as module (hci_usb.o).
 
 HCI USB SCO (voice) support
-CONFIG_BLUEZ_USB_SCO
+CONFIG_BLUEZ_HCIUSB_SCO
   This option enables the SCO support in the HCI USB driver. You need this
   to transmit voice data with your Bluetooth USB device. And your device
   must also support sending SCO data over the HCI layer, because some of
@@ -22877,14 +23069,6 @@ CONFIG_BLUEZ_USB_SCO
  
   Say Y here to compile support for HCI SCO data.
  
-HCI USB zero packet support
-CONFIG_BLUEZ_USB_ZERO_PACKET
-  This option is provided only as a work around for buggy Bluetooth USB 
-  devices. Do NOT enable it unless you know for sure that your device 
-  requires zero packets.
- 
-  Most people should say N here.
-
 HCI VHCI Virtual HCI device driver
 CONFIG_BLUEZ_HCIVHCI
   Bluetooth Virtual HCI device driver.
@@ -23029,15 +23213,22 @@ CONFIG_A2232
   "ser_a2232.o". If you want to do this, answer M here and read
   "<file:Documentation/modules.txt>".
 
-A4000T SCSI support
-CONFIG_A4000T_SCSI
-  Support for the NCR53C710 SCSI controller on the Amiga 4000T.
-
-A4091 SCSI support
-CONFIG_A4091_SCSI
-  Support for the NCR53C710 chip on the Amiga 4091 Z3 SCSI2 controller
-  (1993).  Very obscure -- the 4091 was part of an Amiga 4000 upgrade
-  plan at the time the Amiga business was sold to DKB.
+Amiga NCR53c710 SCSI support
+CONFIG_SCSI_AMIGA7XX
+  Support for various NCR53c710-based SCSI controllers on the Amiga.
+  This includes:
+    - the builtin SCSI controller on the Amiga 4000T,
+    - the Amiga 4091 Zorro III SCSI-2 controller,
+    - the MacroSystem Development's WarpEngine Amiga SCSI-2 controller
+      (info at
+       <http://www.lysator.liu.se/amiga/ar/guide/ar310.guide?FEATURE5>),
+    - the SCSI controller on the Phase5 Blizzard PowerUP 603e+
+      accelerator card for the Amiga 1200,
+    - the SCSI controller on the GVP Turbo 040/060 accelerator.
+  Note that all of the above SCSI controllers, except for the builtin
+  SCSI controller on the Amiga 4000T, reside on the Zorro expansion
+  bus, so you also have to enable Zorro bus support if you want to use
+  them.
 
 Atari support
 CONFIG_ATARI
@@ -23359,11 +23550,6 @@ CONFIG_BLZ1230_SCSI
   1260 accelerator, and the optional SCSI module, say Y. Otherwise,
   say N.
 
-Blizzard PowerUP 603e+ SCSI support
-CONFIG_BLZ603EPLUS_SCSI
-  If you have an Amiga 1200 with a Phase5 Blizzard PowerUP 603e+
-  accelerator, say Y. Otherwise, say N.
-
 Fastlane SCSI support
 CONFIG_FASTLANE_SCSI
   If you have the Phase5 Fastlane Z3 SCSI controller, or plan to use
@@ -23763,7 +23949,7 @@ CONFIG_IDE_8xx_PCCARD
              PCMCIA interface (example: IDIF860 systems)
 
 Use SMC2 for UART
-CONFIG_SMC2_UART
+CONFIG_8xx_SMC2
   If you would like to use SMC2 as a serial port, say Y here.
 
   If in doubt, say Y here.
@@ -24283,6 +24469,11 @@ CONFIG_PPC_RTAS
 
   If unsure, say Y.
 
+Support for Lpar Configuration data in /proc
+CONFIG_LPARCFG
+  This option adds lparcfg entry as /proc/ppc64/lparcfg which returns
+  system configuration info in <key word>=<value> pairs. 
+
 MESH (Power Mac internal SCSI) support
 CONFIG_SCSI_MESH
   Many Power Macintoshes and clones have a MESH (Macintosh Enhanced
@@ -24757,8 +24948,8 @@ CONFIG_SOUND_BT878
 
 SGI Vino Video For Linux
 CONFIG_VIDEO_VINO
-  Say Y here to build in support for the Vino video input system found
-  on SGI Indy machines.
+  Say Y here to include support for SGI VINO (Video In No Out) system
+  found on SGI Indy workstations.
 
 Stradis 4:2:2 MPEG-2 video driver
 CONFIG_VIDEO_STRADIS
@@ -26176,6 +26367,14 @@ CONFIG_SMC_IRCC_FIR
   here and read <file:Documentation/modules.txt>.  The module will be
   called smc-ircc.o.
 
+VIA IrCC
+CONFIG_VIA_IRCC_FIR
+  Say Y here if you want to build support for the VIA Fast Infrared
+  Communications Controller.  It is used in all sorts of VIA686a- and
+  VT1211-based notebooks. If you want to compile it as a module, say M
+  here and read <file:Documentation/modules.txt>.  The module will be
+  called via-ircc.o.
+
 ALi M5123 FIR controller driver
 CONFIG_ALI_FIR
   Say Y here if you want to build support for the ALi M5123 FIR
@@ -27169,16 +27368,11 @@ CONFIG_IA64_GENERIC
   will run on any supported IA-64 system.  However, if you configure
   a kernel for your specific system, it will be faster and smaller.
 
-  To find out what type of IA-64 system you have, you may want to
-  check the IA-64 Linux web site at <http://www.linux-ia64.org/>.
-  As of the time of this writing, most hardware is DIG compliant,
-  so the "DIG-compliant" option is usually the right choice.
-
-  HP-simulator   For the HP simulator (<http://software.hp.com/ia64linux/>).
-  HP-zx1	 For HP zx1 Platforms.
-  SN1            For SGI SN1 Platforms.
-  SN2            For SGI SN2 Platforms.
-  DIG-compliant  For DIG ("Developer's Interface Guide") compliant systems.
+  generic        For any supported IA-64 system
+  DIG-compliant  For DIG ("Developer's Interface Guide") compliant systems
+  HP             For HP systems
+  SGI-SN2        For SGI SN2 systems
+  Ski-simulator  For the HP simulator (<http://www.hpl.hp.com/research/linux/ski/>)
 
   If you don't know what to do, choose "generic".
 
@@ -27465,7 +27659,7 @@ CONFIG_DEBUG_BUGVERBOSE
 Include kgdb kernel debugger
 CONFIG_KGDB
   Include in-kernel hooks for kgdb, the Linux kernel source level
-  debugger.  This project has a web page at
+  debugger.  For i386 architecture there is project page at
   <http://kgdb.sourceforge.net/>.
 
 Include xmon kernel debugger
@@ -27912,7 +28106,7 @@ CONFIG_BLK_DEV_IT8172
   Say Y here to support the on-board IDE controller on the Integrated
   Technology Express, Inc. ITE8172 SBC.  Vendor page at
   <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-  board at <http://www.mvista.com/allies/semiconductor/ite.html>.
+  board at <http://www.mvista.com/partners/semiconductor/ite.html>.
 
 Support ARM926T processor
 CONFIG_CPU_ARM926T
@@ -28080,21 +28274,21 @@ CONFIG_IT8172_REVC
   Say Y here to support the older, Revision C version of the Integrated
   Technology Express, Inc. ITE8172 SBC.  Vendor page at
   <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-  board at <http://www.mvista.com/allies/semiconductor/ite.html>.
+  board at <http://www.mvista.com/partners/semiconductor/ite.html>.
 
 Enable Smart Card Reader 0 Support
 CONFIG_IT8172_SCR0
   Say Y here to support smart-card reader 0 (SCR0) on the Integrated
   Technology Express, Inc. ITE8172 SBC.  Vendor page at
   <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-  board at <http://www.mvista.com/allies/semiconductor/ite.html>.
+  board at <http://www.mvista.com/partners/semiconductor/ite.html>.
 
 Enable Smart Card Reader 1 Support
 CONFIG_IT8172_SCR1
   Say Y here to support smart-card reader 1 (SCR1) on the Integrated
   Technology Express, Inc. ITE8172 SBC.  Vendor page at
   <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-  board at <http://www.mvista.com/allies/semiconductor/ite.html>.
+  board at <http://www.mvista.com/partners/semiconductor/ite.html>.
 
 IT8172 IDE Tuning support
 CONFIG_IT8172_TUNING
@@ -28132,6 +28326,14 @@ CONFIG_SCx200
   This support is also available as a module.  If compiled as a
   module, it will be called scx200.o.
 
+NatSemi SCx200 GPIO support
+CONFIG_SCx200_GPIO
+  Give userspace access to the GPIO pins on the National
+  Semiconductor SCx200 processors.
+
+  This support is also available as a module.  If compiled as a
+  module, it will be called scx200_gpio.o.
+
 NatSemi SCx200 Watchdog
 CONFIG_SCx200_WDT
   Enable the built-in watchdog timer support on the National 
@@ -28283,7 +28485,7 @@ CONFIG_MTD_UCLINUX
   If compiled as a module, it will be called uclinux.o.
 
 NatSemi SCx200 I2C using GPIO pins
-CONFIG_SCx200_GPIO
+CONFIG_SCx200_I2C
   Enable the use of two GPIO pins of a SCx200 processor as an I2C bus.
 
   If you don't know what to do here, say N.
@@ -28512,6 +28714,12 @@ CONFIG_CRYPTO_CAST5
   The CAST5 encryption algorithm (synonymous with CAST-128) is
   described in RFC2144.
 
+CONFIG_CRYPTO_CAST6
+  CAST6 (CAST-256) cipher algorithm.
+  
+  The CAST6 encryption algorithm (synonymous with CAST-256) is
+  described in RFC2612.
+
 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.24-sparse/Makefile b/xenolinux-2.4.25-sparse/Makefile
index a807f96d12..0438db1213 100644
--- a/xenolinux-2.4.24-sparse/Makefile
+++ b/xenolinux-2.4.25-sparse/Makefile
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 24
+SUBLEVEL = 25
 EXTRAVERSION = -xeno
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -180,7 +180,6 @@ DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
 DRIVERS-$(CONFIG_PPC32) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
-DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
 DRIVERS-$(CONFIG_VT) += drivers/video/video.o
 DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
 DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o
@@ -226,6 +225,7 @@ CLEAN_FILES = \
 	drivers/scsi/aic7xxx/aicasm/aicdb.h \
 	drivers/scsi/aic7xxx/aicasm/y.tab.h \
 	drivers/scsi/53c700_d.h \
+	drivers/tc/lk201-map.c \
 	net/khttpd/make_times_h \
 	net/khttpd/times.h \
 	submenu*
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/Makefile
index 815c28107b..815c28107b 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/boot/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile
index 290783cc62..290783cc62 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/boot/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/config.in b/xenolinux-2.4.25-sparse/arch/xeno/config.in
index 37516e88a8..0bc6d0867d 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/config.in
+++ b/xenolinux-2.4.25-sparse/arch/xeno/config.in
@@ -13,10 +13,10 @@ define_bool CONFIG_SBUS n
 define_bool CONFIG_UID16 y
 
 mainmenu_option next_comment
-comment 'XenoLinux'
+comment 'Xenolinux'
 bool 'Support for privileged operations (domain 0)' CONFIG_XENO_PRIV
 endmenu
-# the IBM S/390 patch needs this.
+# The IBM S/390 patch needs this.
 define_bool CONFIG_NO_IDLE_HZ y
 
 mainmenu_option next_comment
@@ -107,6 +107,7 @@ fi
 tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
 tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
+bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
 
 endmenu
 
@@ -130,7 +131,6 @@ dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK
 bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS
 bool 'XenoLinux virtual block device support' CONFIG_XENOLINUX_BLOCK
 #endmenu
-define_bool CONFIG_BLK_DEV_IDE_MODES n
 define_bool CONFIG_BLK_DEV_HD n
 endmenu
 
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/defconfig b/xenolinux-2.4.25-sparse/arch/xeno/defconfig
index 3ba185a19b..33dcb7f653 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/defconfig
+++ b/xenolinux-2.4.25-sparse/arch/xeno/defconfig
@@ -8,11 +8,11 @@ CONFIG_ISA=y
 CONFIG_UID16=y
 
 #
-# XenoLinux Options
+# Xenolinux options
 #
-# support for priviledged domains
+# support for privileged domains
 CONFIG_XENO_PRIV=y
-# On demand timer setting (taken from s390 patch set)
+# on-demand timer setting (taken from s390 patch set)
 CONFIG_NO_IDLE_HZ=y
 
 #
@@ -63,6 +63,7 @@ CONFIG_KCORE_ELF=y
 CONFIG_BINFMT_AOUT=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
+# CONFIG_OOM_KILLER is not set
 
 #
 # Networking options
@@ -166,7 +167,6 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_STATS is not set
 CONFIG_XENOLINUX_BLOCK=y
-# CONFIG_BLK_DEV_IDE_MODES is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -243,6 +243,7 @@ CONFIG_PSMOUSE=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
+# CONFIG_SCx200 is not set
 # CONFIG_SCx200_GPIO is not set
 # CONFIG_AMD_RNG is not set
 # CONFIG_INTEL_RNG is not set
@@ -265,6 +266,7 @@ CONFIG_PSMOUSE=y
 #
 # CONFIG_DRM is not set
 # CONFIG_MWAVE is not set
+# CONFIG_OBMOUSE is not set
 
 #
 # File systems
@@ -322,6 +324,11 @@ CONFIG_EXT2_FS=y
 # CONFIG_UDF_RW is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_UFS_FS_WRITE is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_TRACE is not set
+# CONFIG_XFS_DEBUG is not set
 
 #
 # Network File Systems
@@ -433,11 +440,6 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_KALLSYMS=y
 # CONFIG_FRAME_POINTER is not set
-
-#
-# ACPI Support
-#
-# CONFIG_ACPI is not set
 CONFIG_LOG_BUF_SHIFT=0
 
 #
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/balloon/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/Makefile
index f780a515e0..f780a515e0 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/balloon/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/balloon/balloon.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/balloon.c
index b7e6802077..b7e6802077 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/balloon/balloon.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/balloon/balloon.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/Makefile
index 7c87e099c7..7c87e099c7 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_block.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c
index 883cee38fc..883cee38fc 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_block.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_block.h b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.h
index c735a6ec44..c735a6ec44 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_block.h
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.h
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c
index 61f232acb9..0677096b84 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_vbd.c
@@ -237,7 +237,7 @@ static int xlvbd_init_device(xen_disk_t *xd)
         set_device_ro(device, 1); 
 
     gd->flags[minor >> gd->minor_shift] |= GENHD_FL_XENO;
-        
+
     /* NB. Linux 2.4 only handles 32-bit sector offsets and capacities. */
     capacity = (unsigned long)xd->capacity;
 
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/console/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/Makefile
index 546180a3c2..546180a3c2 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/console/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/console/console.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c
index b93fe47656..b93fe47656 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/console/console.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/Makefile
index 9030801f14..9030801f14 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/dom0_core.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/dom0_core.c
index 08144d9678..08144d9678 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/dom0_core.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/dom0_core.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/vfr.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/vfr.c
index 9eca42de56..56b491314b 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/dom0/vfr.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/dom0/vfr.c
@@ -142,7 +142,6 @@ static int vfr_write_proc(struct file *file, const char *buffer,
         /* NB. Prefix matches must go first! */
         if (strncmp(&buffer[fs], "src", fl) == 0)
         {
-
             op.u.net_rule.src_dom = VIF_SPECIAL;
             op.u.net_rule.src_idx = VIF_ANY_INTERFACE;
         }
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/Makefile
index b44a288a5b..b44a288a5b 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/network.c
index 29f7c2224f..29f7c2224f 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/network/network.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/network/network.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/kernel/Makefile
index a43a615e2f..a43a615e2f 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/entry.S b/xenolinux-2.4.25-sparse/arch/xeno/kernel/entry.S
index 9b1a77d4c1..9b1a77d4c1 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/entry.S
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/entry.S
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/head.S b/xenolinux-2.4.25-sparse/arch/xeno/kernel/head.S
index 361815a58b..361815a58b 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/head.S
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/head.S
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/hypervisor.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/hypervisor.c
index 3f414e9876..3f414e9876 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/hypervisor.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/hypervisor.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/i386_ksyms.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/i386_ksyms.c
index e62ca85c04..e62ca85c04 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/i386_ksyms.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/i386_ksyms.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/ioport.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/ioport.c
index fc0164045f..fc0164045f 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/ioport.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/ioport.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/irq.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/irq.c
index c88e976125..c88e976125 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/irq.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/irq.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/ldt.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/ldt.c
index 501ce94484..6a2bd7a0d9 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/ldt.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/ldt.c
@@ -12,39 +12,151 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/ldt.h>
 #include <asm/desc.h>
 
+#ifdef CONFIG_SMP /* avoids "defined but not used" warnig */
+static void flush_ldt(void *mm)
+{
+	if (current->active_mm)
+		load_LDT(&current->active_mm->context);
+}
+#endif
+
+static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
+{
+	void *oldldt;
+	void *newldt;
+	int oldsize;
+
+	if (mincount <= pc->size)
+		return 0;
+	oldsize = pc->size;
+	mincount = (mincount+511)&(~511);
+	if (mincount*LDT_ENTRY_SIZE > PAGE_SIZE)
+		newldt = vmalloc(mincount*LDT_ENTRY_SIZE);
+	else
+		newldt = kmalloc(mincount*LDT_ENTRY_SIZE, GFP_KERNEL);
+
+	if (!newldt)
+		return -ENOMEM;
+
+	if (oldsize)
+		memcpy(newldt, pc->ldt, oldsize*LDT_ENTRY_SIZE);
+
+	oldldt = pc->ldt;
+	memset(newldt+oldsize*LDT_ENTRY_SIZE, 0, (mincount-oldsize)*LDT_ENTRY_SIZE);
+	wmb();
+	pc->ldt = newldt;
+	pc->size = mincount;
+	if (reload) {
+		make_pages_readonly(
+			pc->ldt,
+			(pc->size*LDT_ENTRY_SIZE)/PAGE_SIZE);
+		load_LDT(pc);
+		flush_page_update_queue();
+#ifdef CONFIG_SMP
+		if (current->mm->cpu_vm_mask != (1<<smp_processor_id()))
+			smp_call_function(flush_ldt, 0, 1, 1);
+#endif
+	}
+	wmb();
+	if (oldsize) {
+		if (oldsize*LDT_ENTRY_SIZE > PAGE_SIZE)
+			vfree(oldldt);
+		else
+			kfree(oldldt);
+	}
+	return 0;
+}
+
+static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
+{
+	int err = alloc_ldt(new, old->size, 0);
+	if (err < 0) {
+		printk(KERN_WARNING "ldt allocation failed\n");
+		new->size = 0;
+		return err;
+	}
+	memcpy(new->ldt, old->ldt, old->size*LDT_ENTRY_SIZE);
+	make_pages_readonly(new->ldt, (new->size*LDT_ENTRY_SIZE)/PAGE_SIZE);
+	return 0;
+}
+
 /*
- * read_ldt() is not really atomic - this is not a problem since
- * synchronization of reads and writes done to the LDT has to be
- * assured by user-space anyway. Writes are atomic, to protect
- * the security checks done on new descriptors.
+ * we do not have to muck with descriptors here, that is
+ * done in switch_mm() as needed.
  */
+int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+{
+	struct mm_struct * old_mm;
+	int retval = 0;
+
+	init_MUTEX(&mm->context.sem);
+	mm->context.size = 0;
+	old_mm = current->mm;
+	if (old_mm && old_mm->context.size > 0) {
+		down(&old_mm->context.sem);
+		retval = copy_ldt(&mm->context, &old_mm->context);
+		up(&old_mm->context.sem);
+	}
+	return retval;
+}
+
+/*
+ * No need to lock the MM as we are the last user
+ * Do not touch the ldt register, we are already
+ * in the next thread.
+ */
+void destroy_context(struct mm_struct *mm)
+{
+	if (mm->context.size) {
+		make_pages_writeable(
+			mm->context.ldt, 
+			(mm->context.size*LDT_ENTRY_SIZE)/PAGE_SIZE);
+		flush_page_update_queue();
+		if (mm->context.size*LDT_ENTRY_SIZE > PAGE_SIZE)
+			vfree(mm->context.ldt);
+		else
+			kfree(mm->context.ldt);
+		mm->context.size = 0;
+	}
+}
+
 static int read_ldt(void * ptr, unsigned long bytecount)
 {
-    int err;
-    unsigned long size;
-    struct mm_struct * mm = current->mm;
+	int err;
+	unsigned long size;
+	struct mm_struct * mm = current->mm;
 
-    err = 0;
-    if (!mm->context.segments)
-        goto out;
+	if (!mm->context.size)
+		return 0;
+	if (bytecount > LDT_ENTRY_SIZE*LDT_ENTRIES)
+		bytecount = LDT_ENTRY_SIZE*LDT_ENTRIES;
 
-    size = LDT_ENTRIES*LDT_ENTRY_SIZE;
-    if (size > bytecount)
-        size = bytecount;
+	down(&mm->context.sem);
+	size = mm->context.size*LDT_ENTRY_SIZE;
+	if (size > bytecount)
+		size = bytecount;
 
-    err = size;
-    if (copy_to_user(ptr, mm->context.segments, size))
-        err = -EFAULT;
- out:
-    return err;
+	err = 0;
+	if (copy_to_user(ptr, mm->context.ldt, size))
+		err = -EFAULT;
+	up(&mm->context.sem);
+	if (err < 0)
+		return err;
+	if (size != bytecount) {
+		/* zero-fill the rest */
+		clear_user(ptr+size, bytecount-size);
+	}
+	return bytecount;
 }
 
+
 static int read_default_ldt(void * ptr, unsigned long bytecount)
 {
     int err;
@@ -53,7 +165,7 @@ static int read_default_ldt(void * ptr, unsigned long bytecount)
 
     err = 0;
     address = &default_ldt[0];
-    size = sizeof(struct desc_struct);
+    size = 5*sizeof(struct desc_struct);
     if (size > bytecount)
         size = bytecount;
 
@@ -96,22 +208,15 @@ static int write_ldt(void * ptr, unsigned long bytecount, int oldmode)
     if (ldt_info.base_addr >= PAGE_OFFSET)
         goto out;
 
-    down_write(&mm->mmap_sem);
-    if (!mm->context.segments) {
-        void * segments = vmalloc(LDT_ENTRIES*LDT_ENTRY_SIZE);
-        error = -ENOMEM;
-        if (!segments)
-            goto out_unlock;
-        memset(segments, 0, LDT_ENTRIES*LDT_ENTRY_SIZE);
-        make_pages_readonly(segments, (LDT_ENTRIES*LDT_ENTRY_SIZE)/PAGE_SIZE);
-        wmb();
-        mm->context.segments = segments;
-        mm->context.cpuvalid = 1UL << smp_processor_id();
-        load_LDT(mm);
-        flush_page_update_queue();
+    down(&mm->context.sem);
+    if (ldt_info.entry_number >= mm->context.size) {
+      error = alloc_ldt(&current->mm->context, ldt_info.entry_number+1, 1);
+      if (error < 0)
+	goto out_unlock;
     }
 
-    lp = (__u32 *)((ldt_info.entry_number<<3) + (char *)mm->context.segments);
+
+    lp = (__u32 *)((ldt_info.entry_number<<3) + (char *)mm->context.ldt);
     phys_lp = arbitrary_virt_to_phys(lp);
 
     /* Allow LDTs to be cleared by the user. */
@@ -155,7 +260,7 @@ static int write_ldt(void * ptr, unsigned long bytecount, int oldmode)
     error = HYPERVISOR_update_descriptor(phys_lp, entry_1, entry_2);
 
  out_unlock:
-    up_write(&mm->mmap_sem);
+    up(&mm->context.sem);
  out:
     return error;
 }
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/process.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/process.c
index d57c6ba2dc..640179661b 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/process.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/process.c
@@ -81,7 +81,7 @@ void enable_hlt(void)
 void cpu_idle (void)
 {
     extern int set_timeout_timer(void);
-    
+
     /* Endless idle loop with no priority at all. */
     init_idle();
     current->nice = 20;
@@ -150,24 +150,6 @@ void show_regs(struct pt_regs * regs)
     show_trace(&regs->esp);
 }
 
-/*
- * No need to lock the MM as we are the last user
- */
-void release_segments(struct mm_struct *mm)
-{
-    void * ldt = mm->context.segments;
-
-    /*
-     * free the LDT
-     */
-    if (ldt) {
-        mm->context.segments = NULL;
-        clear_LDT();
-        make_pages_writeable(ldt, (LDT_ENTRIES*LDT_ENTRY_SIZE)/PAGE_SIZE);
-        flush_page_update_queue();
-        vfree(ldt);
-    }
-}
 
 /*
  * Create a kernel thread
@@ -223,46 +205,18 @@ void flush_thread(void)
 void release_thread(struct task_struct *dead_task)
 {
     if (dead_task->mm) {
-        void * ldt = dead_task->mm->context.segments;
-
         // temporary debugging check
-        if (ldt) {
-            printk("WARNING: dead process %8s still has LDT? <%p>\n",
-                   dead_task->comm, ldt);
+        if (dead_task->mm->context.size) {
+            printk("WARNING: dead process %8s still has LDT? <%p/%p>\n",
+                   dead_task->comm, 
+		   dead_task->mm->context.ldt,
+		   dead_task->mm->context.size);
             BUG();
         }
     }
+    //release_x86_irqs(dead_task);
 }
 
-/*
- * we do not have to muck with descriptors here, that is
- * done in switch_mm() as needed.
- */
-void copy_segments(struct task_struct *p, struct mm_struct *new_mm)
-{
-    struct mm_struct * old_mm;
-    void *old_ldt, *ldt;
-
-    ldt = NULL;
-    old_mm = current->mm;
-    if (old_mm && (old_ldt = old_mm->context.segments) != NULL) {
-        /*
-         * Completely new LDT, we initialize it from the parent:
-         */
-        ldt = vmalloc(LDT_ENTRIES*LDT_ENTRY_SIZE);
-        if ( ldt == NULL )
-        {
-            printk(KERN_WARNING "ldt allocation failed\n");
-        }
-        else
-        {
-            memcpy(ldt, old_ldt, LDT_ENTRIES*LDT_ENTRY_SIZE);
-            make_pages_readonly(ldt, (LDT_ENTRIES*LDT_ENTRY_SIZE)/PAGE_SIZE);
-        }
-    }
-    new_mm->context.segments = ldt;
-    new_mm->context.cpuvalid = ~0UL;	/* valid on all CPU's - they can't have stale data */
-}
 
 /*
  * Save a segment.
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/setup.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/setup.c
index 4856250089..bb9292d5e9 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/setup.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/setup.c
@@ -325,7 +325,7 @@ void __init setup_arch(char **cmdline_p)
         current->thread.io_pl = 1;
     }
 
-    if ( start_info.flags & SIF_INITDOMAIN )
+    if (start_info.flags & SIF_INITDOMAIN )
     {
         if( !(start_info.flags & SIF_PRIVILEGED) )
             panic("Xen granted us console access but not privileged status");
@@ -710,6 +710,7 @@ static int __init have_cpuid_p(void)
 #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
 unsigned char eddnr;
 struct edd_info edd[EDDMAXNR];
+unsigned int edd_disk80_sig;
 /**
  * copy_edd() - Copy the BIOS EDD information
  *              from empty_zero_page into a safe place.
@@ -719,6 +720,7 @@ static inline void copy_edd(void)
 {
      eddnr = EDD_NR;
      memcpy(edd, EDD_BUF, sizeof(edd));
+     edd_disk80_sig = DISK80_SIGNATURE_BUFFER;
 }
 #else
 static inline void copy_edd(void) {}
@@ -1060,7 +1062,7 @@ void __init cpu_init (void)
 
     HYPERVISOR_stack_switch(__KERNEL_DS, current->thread.esp0);
 
-    load_LDT(&init_mm);
+    load_LDT(&init_mm.context);
     flush_page_update_queue();
 
     /* Force FPU initialization. */
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/signal.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/signal.c
index f646c5c0ca..f646c5c0ca 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/signal.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/signal.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/time.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c
index 875a216fb0..0e0542236a 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/time.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/time.c
@@ -445,7 +445,7 @@ static inline void do_timer_interrupt(int irq, void *dev_id,
     }
 
 #ifdef CONFIG_XENO_PRIV
-	if ( (start_info.flags & SIF_INITDOMAIN) && 
+	if ( (start_info.flags & SIF_INITDOMAIN) &&
          ((time_status & STA_UNSYNC) == 0) )
     {
         /* Send synchronised time to Xen approximately every minute. */
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/kernel/traps.c b/xenolinux-2.4.25-sparse/arch/xeno/kernel/traps.c
index 63288fc282..63288fc282 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/kernel/traps.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/kernel/traps.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/lib/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/lib/Makefile
index 3bbf40148e..3bbf40148e 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/lib/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/lib/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/lib/delay.c b/xenolinux-2.4.25-sparse/arch/xeno/lib/delay.c
index 0035bed074..0035bed074 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/lib/delay.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/lib/delay.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/lib/xeno_proc.c b/xenolinux-2.4.25-sparse/arch/xeno/lib/xeno_proc.c
index 40b0d6086f..40b0d6086f 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/lib/xeno_proc.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/lib/xeno_proc.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/mm/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/mm/Makefile
index d0d16114b6..d0d16114b6 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/mm/Makefile
+++ b/xenolinux-2.4.25-sparse/arch/xeno/mm/Makefile
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/mm/fault.c b/xenolinux-2.4.25-sparse/arch/xeno/mm/fault.c
index f096f4cc1e..d1c34d93d7 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/mm/fault.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/mm/fault.c
@@ -208,7 +208,8 @@ bad_area:
 	/* User mode accesses just cause a SIGSEGV */
 	if (error_code & 4) {
 		tsk->thread.cr2 = address;
-		tsk->thread.error_code = error_code;
+		/* Kernel addresses are always protection faults */
+		tsk->thread.error_code = error_code | (address >= TASK_SIZE);
 		tsk->thread.trap_no = 14;
 		info.si_signo = SIGSEGV;
 		info.si_errno = 0;
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/mm/hypervisor.c b/xenolinux-2.4.25-sparse/arch/xeno/mm/hypervisor.c
index 94592d63f1..94592d63f1 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/mm/hypervisor.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/mm/hypervisor.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/mm/init.c b/xenolinux-2.4.25-sparse/arch/xeno/mm/init.c
index b1f8019ef9..b1f8019ef9 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/mm/init.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/mm/init.c
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/mm/ioremap.c b/xenolinux-2.4.25-sparse/arch/xeno/mm/ioremap.c
index 078fede144..e0e68216a3 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/mm/ioremap.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/mm/ioremap.c
@@ -202,7 +202,7 @@ void __init *bt_ioremap(unsigned long machine_addr, unsigned long size)
          */
         nrpages = size >> PAGE_SHIFT;
         if (nrpages > NR_FIX_BTMAPS)
-            return NULL;
+                return NULL;
 
         /*
          * Ok, go for it..
diff --git a/xenolinux-2.4.24-sparse/arch/xeno/vmlinux.lds b/xenolinux-2.4.25-sparse/arch/xeno/vmlinux.lds
index 7c4c4f8e9c..7c4c4f8e9c 100644
--- a/xenolinux-2.4.24-sparse/arch/xeno/vmlinux.lds
+++ b/xenolinux-2.4.25-sparse/arch/xeno/vmlinux.lds
diff --git a/xenolinux-2.4.24-sparse/drivers/block/ll_rw_blk.c b/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c
index bca30ae493..419a050b25 100644
--- a/xenolinux-2.4.24-sparse/drivers/block/ll_rw_blk.c
+++ b/xenolinux-2.4.25-sparse/drivers/block/ll_rw_blk.c
@@ -1377,9 +1377,7 @@ void ll_rw_block(int rw, int nr, struct buffer_head * bhs[])
 	for (i = 0; i < nr; i++) {
 		struct buffer_head *bh = bhs[i];
 
-		/* Only one thread can actually submit the I/O. */
-		if (test_and_set_bit(BH_Lock, &bh->b_state))
-			continue;
+		lock_buffer(bh);
 
 		/* We have the buffer lock */
 		atomic_inc(&bh->b_count);
diff --git a/xenolinux-2.4.24-sparse/drivers/char/mem.c b/xenolinux-2.4.25-sparse/drivers/char/mem.c
index 73e6d48713..73e6d48713 100644
--- a/xenolinux-2.4.24-sparse/drivers/char/mem.c
+++ b/xenolinux-2.4.25-sparse/drivers/char/mem.c
diff --git a/xenolinux-2.4.24-sparse/drivers/char/tty_io.c b/xenolinux-2.4.25-sparse/drivers/char/tty_io.c
index e5334deb1d..b3d0fb4397 100644
--- a/xenolinux-2.4.24-sparse/drivers/char/tty_io.c
+++ b/xenolinux-2.4.25-sparse/drivers/char/tty_io.c
@@ -168,6 +168,7 @@ extern void txx9_rs_init(void);
 extern void txx9_serial_console_init(void);
 extern void sb1250_serial_console_init(void);
 extern void arc_console_init(void);
+extern int hvc_console_init(void);
 
 #ifndef MIN
 #define MIN(a,b)	((a) < (b) ? (a) : (b))
@@ -2326,6 +2327,9 @@ static struct tty_driver dev_tty_driver, dev_syscons_driver;
 #ifdef CONFIG_UNIX98_PTYS
 static struct tty_driver dev_ptmx_driver;
 #endif
+#ifdef CONFIG_HVC_CONSOLE
+	hvc_console_init();
+#endif
 #ifdef CONFIG_VT
 static struct tty_driver dev_console_driver;
 #endif
diff --git a/xenolinux-2.4.24-sparse/fs/exec.c b/xenolinux-2.4.25-sparse/fs/exec.c
index 4f512cbb24..2548d1d1f8 100644
--- a/xenolinux-2.4.24-sparse/fs/exec.c
+++ b/xenolinux-2.4.25-sparse/fs/exec.c
@@ -428,6 +428,15 @@ static int exec_mmap(void)
 
 	old_mm = current->mm;
 
+	if (old_mm && atomic_read(&old_mm->mm_users) == 1) {
+		mm_release();
+		down_write(&old_mm->mmap_sem);
+		exit_mmap(old_mm);
+		up_write(&old_mm->mmap_sem);
+		return 0;
+	}
+
+
 	mm = mm_alloc();
 	if (mm) {
 		struct mm_struct *active_mm;
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/bugs.h b/xenolinux-2.4.25-sparse/include/asm-xeno/bugs.h
index c46b6a0b15..c46b6a0b15 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/bugs.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/bugs.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/desc.h b/xenolinux-2.4.25-sparse/include/asm-xeno/desc.h
index 545b7f8256..33309a9671 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/desc.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/desc.h
@@ -25,15 +25,15 @@ static inline void clear_LDT(void)
     queue_set_ldt(0, 0);
 }
 
-static inline void load_LDT(struct mm_struct *mm)
+static inline void load_LDT(mm_context_t *pc)
 {
-    void *segments = mm->context.segments;
-    int count = 0;
-
-    if ( unlikely(segments != NULL) )
-        count = LDT_ENTRIES;
-         
-    queue_set_ldt((unsigned long)segments, count);
+    void *segments = pc->ldt;
+    int count = pc->size;
+    
+    if ( count == 0 )
+        segments = NULL;
+    
+    queue_set_ldt((unsigned long)segments, count);               
 }
 
 #endif /* __ASSEMBLY__ */
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/fixmap.h b/xenolinux-2.4.25-sparse/include/asm-xeno/fixmap.h
index 2441b01d4e..2441b01d4e 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/fixmap.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/fixmap.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/highmem.h b/xenolinux-2.4.25-sparse/include/asm-xeno/highmem.h
index 7e56b1b32d..7e56b1b32d 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/highmem.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/highmem.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/hw_irq.h b/xenolinux-2.4.25-sparse/include/asm-xeno/hw_irq.h
index d99d15bd24..d99d15bd24 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/hw_irq.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/hw_irq.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/hypervisor.h b/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h
index 18dbe86ec1..18dbe86ec1 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/hypervisor.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/irq.h b/xenolinux-2.4.25-sparse/include/asm-xeno/irq.h
index 3a4a3e394f..3a4a3e394f 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/irq.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/irq.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/keyboard.h b/xenolinux-2.4.25-sparse/include/asm-xeno/keyboard.h
index 4afd25cd42..4afd25cd42 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/keyboard.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/keyboard.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/mmu_context.h b/xenolinux-2.4.25-sparse/include/asm-xeno/mmu_context.h
index 1eab441990..7972ce7d74 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/mmu_context.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/mmu_context.h
@@ -7,10 +7,12 @@
 #include <asm/pgalloc.h>
 
 /*
- * possibly do the LDT unload here?
+ * hooks to add arch specific data into the mm struct.
+ * Note that destroy_context is called even if init_new_context
+ * fails.
  */
-#define destroy_context(mm)		do { } while(0)
-#define init_new_context(tsk,mm)	0
+int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
+void destroy_context(struct mm_struct *mm);
 
 #ifdef CONFIG_SMP
 
@@ -32,20 +34,19 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, str
 	if (prev != next) {
 		/* stop flush ipis for the previous mm */
 		clear_bit(cpu, &prev->cpu_vm_mask);
-		/*
-		 * Re-load LDT if necessary
-		 */
-		if (prev->context.segments != next->context.segments)
-			load_LDT(next);
 #ifdef CONFIG_SMP
 		cpu_tlbstate[cpu].state = TLBSTATE_OK;
 		cpu_tlbstate[cpu].active_mm = next;
 #endif
-		set_bit(cpu, &next->cpu_vm_mask);
-		set_bit(cpu, &next->context.cpuvalid);
+
 		/* Re-load page tables */
 		cur_pgd = next->pgd;
 		queue_pt_switch(__pa(cur_pgd));
+                /* load_LDT, if either the previous or next thread
+                 * has a non-default LDT.
+                 */
+                if (next->context.size+prev->context.size)
+                        load_LDT(&next->context);
 	}
 #ifdef CONFIG_SMP
 	else {
@@ -56,10 +57,10 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, str
 			/* We were in lazy tlb mode and leave_mm disabled 
 			 * tlb flush IPI delivery. We must reload %cr3.
 			 */
-			load_cr3(next->pgd);
-		}
-		if (!test_and_set_bit(cpu, &next->context.cpuvalid))
+		        cur_pgd = next->pgd;
+		        queue_pt_switch(__pa(cur_pgd));
 			load_LDT(next);
+		}
 	}
 #endif
 }
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/msr.h b/xenolinux-2.4.25-sparse/include/asm-xeno/msr.h
index 1a2c8765a8..1a2c8765a8 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/msr.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/msr.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/multicall.h b/xenolinux-2.4.25-sparse/include/asm-xeno/multicall.h
index f0ea5c3a66..f0ea5c3a66 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/multicall.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/multicall.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/page.h b/xenolinux-2.4.25-sparse/include/asm-xeno/page.h
index b7640a7d78..b7640a7d78 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/page.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/page.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/pgalloc.h b/xenolinux-2.4.25-sparse/include/asm-xeno/pgalloc.h
index 9a90cb1b1d..9a90cb1b1d 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/pgalloc.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/pgalloc.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/pgtable-2level.h b/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable-2level.h
index c780f644c0..c780f644c0 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/pgtable-2level.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable-2level.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/pgtable.h b/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable.h
index 07087bdf39..07087bdf39 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/pgtable.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/pgtable.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/proc_cmd.h b/xenolinux-2.4.25-sparse/include/asm-xeno/proc_cmd.h
index 2fddd2c243..2fddd2c243 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/proc_cmd.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/proc_cmd.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/processor.h b/xenolinux-2.4.25-sparse/include/asm-xeno/processor.h
index 0b4571a9da..33bdbd7817 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/processor.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/processor.h
@@ -401,9 +401,12 @@ extern void release_thread(struct task_struct *);
  */
 extern int arch_kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 
-/* Copy and release all segment info associated with a VM */
-extern void copy_segments(struct task_struct *p, struct mm_struct * mm);
-extern void release_segments(struct mm_struct * mm);
+/* Copy and release all segment info associated with a VM
+ * Unusable due to lack of error handling, use {init_new,destroy}_context
+ * instead.
+ */
+static inline void copy_segments(struct task_struct *p, struct mm_struct * mm) { }
+static inline void release_segments(struct mm_struct * mm) { }
 
 /*
  * Return saved PC of a blocked thread.
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/ptrace.h b/xenolinux-2.4.25-sparse/include/asm-xeno/ptrace.h
index 4457ac0b17..4457ac0b17 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/ptrace.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/ptrace.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/segment.h b/xenolinux-2.4.25-sparse/include/asm-xeno/segment.h
index ca13028ce0..ca13028ce0 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/segment.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/segment.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/smp.h b/xenolinux-2.4.25-sparse/include/asm-xeno/smp.h
index 804b93c332..804b93c332 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/smp.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/smp.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/suspend.h b/xenolinux-2.4.25-sparse/include/asm-xeno/suspend.h
index 337290dc95..337290dc95 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/suspend.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/suspend.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/system.h b/xenolinux-2.4.25-sparse/include/asm-xeno/system.h
index 3b59252ca3..3b59252ca3 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/system.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/system.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/vga.h b/xenolinux-2.4.25-sparse/include/asm-xeno/vga.h
index d0624cf480..d0624cf480 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/vga.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/vga.h
diff --git a/xenolinux-2.4.24-sparse/include/asm-xeno/xeno_proc.h b/xenolinux-2.4.25-sparse/include/asm-xeno/xeno_proc.h
index d794b733f5..d794b733f5 100644
--- a/xenolinux-2.4.24-sparse/include/asm-xeno/xeno_proc.h
+++ b/xenolinux-2.4.25-sparse/include/asm-xeno/xeno_proc.h
diff --git a/xenolinux-2.4.24-sparse/include/linux/blk.h b/xenolinux-2.4.25-sparse/include/linux/blk.h
index 4618a527f1..4618a527f1 100644
--- a/xenolinux-2.4.24-sparse/include/linux/blk.h
+++ b/xenolinux-2.4.25-sparse/include/linux/blk.h
diff --git a/xenolinux-2.4.24-sparse/include/linux/major.h b/xenolinux-2.4.25-sparse/include/linux/major.h
index f311bd4a9d..f311bd4a9d 100644
--- a/xenolinux-2.4.24-sparse/include/linux/major.h
+++ b/xenolinux-2.4.25-sparse/include/linux/major.h
diff --git a/xenolinux-2.4.24-sparse/include/linux/sched.h b/xenolinux-2.4.25-sparse/include/linux/sched.h
index ed42340517..1ac29aa143 100644
--- a/xenolinux-2.4.24-sparse/include/linux/sched.h
+++ b/xenolinux-2.4.25-sparse/include/linux/sched.h
@@ -432,8 +432,10 @@ struct task_struct {
 #define PF_DUMPCORE	0x00000200	/* dumped core */
 #define PF_SIGNALED	0x00000400	/* killed by a signal */
 #define PF_MEMALLOC	0x00000800	/* Allocating memory */
+#define PF_MEMDIE      0x00001000       /* Killed for out-of-memory */
 #define PF_FREE_PAGES	0x00002000	/* per process page freeing */
 #define PF_NOIO		0x00004000	/* avoid generating further I/O */
+#define PF_FSTRANS	0x00008000	/* inside a filesystem transaction */
 
 #define PF_USEDFPU	0x00100000	/* task used FPU this quantum (SMP) */
 
diff --git a/xenolinux-2.4.24-sparse/include/linux/sunrpc/debug.h b/xenolinux-2.4.25-sparse/include/linux/sunrpc/debug.h
index 67dbfb887e..67dbfb887e 100644
--- a/xenolinux-2.4.24-sparse/include/linux/sunrpc/debug.h
+++ b/xenolinux-2.4.25-sparse/include/linux/sunrpc/debug.h
diff --git a/xenolinux-2.4.24-sparse/include/linux/timer.h b/xenolinux-2.4.25-sparse/include/linux/timer.h
index 238083218f..238083218f 100644
--- a/xenolinux-2.4.24-sparse/include/linux/timer.h
+++ b/xenolinux-2.4.25-sparse/include/linux/timer.h
diff --git a/xenolinux-2.4.24-sparse/init/do_mounts.c b/xenolinux-2.4.25-sparse/init/do_mounts.c
index 8e2b89fbb3..8e2b89fbb3 100644
--- a/xenolinux-2.4.24-sparse/init/do_mounts.c
+++ b/xenolinux-2.4.25-sparse/init/do_mounts.c
diff --git a/xenolinux-2.4.24-sparse/kernel/panic.c b/xenolinux-2.4.25-sparse/kernel/panic.c
index 6ab619a607..6ab619a607 100644
--- a/xenolinux-2.4.24-sparse/kernel/panic.c
+++ b/xenolinux-2.4.25-sparse/kernel/panic.c
diff --git a/xenolinux-2.4.24-sparse/kernel/printk.c b/xenolinux-2.4.25-sparse/kernel/printk.c
index 6cfedd9c02..6cfedd9c02 100644
--- a/xenolinux-2.4.24-sparse/kernel/printk.c
+++ b/xenolinux-2.4.25-sparse/kernel/printk.c
diff --git a/xenolinux-2.4.24-sparse/kernel/time.c b/xenolinux-2.4.25-sparse/kernel/time.c
index fe6ecde6d8..fe6ecde6d8 100644
--- a/xenolinux-2.4.24-sparse/kernel/time.c
+++ b/xenolinux-2.4.25-sparse/kernel/time.c
diff --git a/xenolinux-2.4.24-sparse/kernel/timer.c b/xenolinux-2.4.25-sparse/kernel/timer.c
index 567794ab26..567794ab26 100644
--- a/xenolinux-2.4.24-sparse/kernel/timer.c
+++ b/xenolinux-2.4.25-sparse/kernel/timer.c
diff --git a/xenolinux-2.4.24-sparse/lndir-rel b/xenolinux-2.4.25-sparse/lndir-rel
index d0bd863202..d0bd863202 100755
--- a/xenolinux-2.4.24-sparse/lndir-rel
+++ b/xenolinux-2.4.25-sparse/lndir-rel
diff --git a/xenolinux-2.4.24-sparse/mkbuildtree b/xenolinux-2.4.25-sparse/mkbuildtree
index d9ea5b6510..d9ea5b6510 100755
--- a/xenolinux-2.4.24-sparse/mkbuildtree
+++ b/xenolinux-2.4.25-sparse/mkbuildtree
diff --git a/xenolinux-2.4.24-sparse/mm/memory.c b/xenolinux-2.4.25-sparse/mm/memory.c
index dc09253985..dc09253985 100644
--- a/xenolinux-2.4.24-sparse/mm/memory.c
+++ b/xenolinux-2.4.25-sparse/mm/memory.c
diff --git a/xenolinux-2.4.24-sparse/mm/mprotect.c b/xenolinux-2.4.25-sparse/mm/mprotect.c
index e618a3b74d..e618a3b74d 100644
--- a/xenolinux-2.4.24-sparse/mm/mprotect.c
+++ b/xenolinux-2.4.25-sparse/mm/mprotect.c
diff --git a/xenolinux-2.4.24-sparse/mm/mremap.c b/xenolinux-2.4.25-sparse/mm/mremap.c
index 2a0da0debc..5af0b100f9 100644
--- a/xenolinux-2.4.24-sparse/mm/mremap.c
+++ b/xenolinux-2.4.25-sparse/mm/mremap.c
@@ -260,16 +260,20 @@ unsigned long do_mremap(unsigned long addr,
 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
 			goto out;
 
-		do_munmap(current->mm, new_addr, new_len);
+		ret = do_munmap(current->mm, new_addr, new_len);
+		if (ret && new_len)
+			goto out;
 	}
 
 	/*
 	 * Always allow a shrinking remap: that just unmaps
 	 * the unnecessary pages..
 	 */
-	ret = addr;
 	if (old_len >= new_len) {
-		do_munmap(current->mm, addr+new_len, old_len - new_len);
+		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
+		if (ret && old_len != new_len)
+			goto out;
+		ret = addr;
 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
 			goto out;
 	}
diff --git a/xenolinux-2.4.24-sparse/mm/swapfile.c b/xenolinux-2.4.25-sparse/mm/swapfile.c
index de04a376d2..de04a376d2 100644
--- a/xenolinux-2.4.24-sparse/mm/swapfile.c
+++ b/xenolinux-2.4.25-sparse/mm/swapfile.c
diff --git a/xenolinux-2.4.24-sparse/mm/vmalloc.c b/xenolinux-2.4.25-sparse/mm/vmalloc.c
index b5b4da9161..b5b4da9161 100644
--- a/xenolinux-2.4.24-sparse/mm/vmalloc.c
+++ b/xenolinux-2.4.25-sparse/mm/vmalloc.c