diff --git a/.hgtags b/.hgtags index 84bffdda6a..2be2d0b44d 100644 --- a/.hgtags +++ b/.hgtags @@ -1,6 +1,6 @@ 487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1 3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable 30c521db4c71960b0cf1d9c9e1b658e77b535a3e latest-stable -7ae55a8c64e4eafacc6907232fa0f45a5c15becb semistable +9afec5bc14aeb197ef37ea54a57eacd427463fc3 semistable 30c521db4c71960b0cf1d9c9e1b658e77b535a3e split-1.0 3d330e41f41ce1bc118c02346e18949ad5d67f6b split-1.1 diff --git a/.rootkeys b/.rootkeys index fb385053ed..78f0158385 100644 --- a/.rootkeys +++ b/.rootkeys @@ -42,89 +42,89 @@ 3f815145CB8XdPUqsmhAjSDFuwOoqA extras/mini-os/mm.c 3f815145vGYx1WY79voKkZB9yKwJKQ extras/mini-os/time.c 3f815145xlKBAQmal9oces3G_Mvxqw extras/mini-os/traps.c -3e5a4e6589G-U42lFKs43plskXoFxQ linux-2.4.26-xen-sparse/Makefile -3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg linux-2.4.26-xen-sparse/arch/xen/Makefile -3e5a4e65n-KhsEAs-A4ULiStBp-r6w linux-2.4.26-xen-sparse/arch/xen/boot/Makefile -3e5a4e65OV_j_DBtjzt5vej771AJsA linux-2.4.26-xen-sparse/arch/xen/config.in -40648526SxcA4lGIHB_k7ID8VlRSzw linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 -40c73c77QesbL7eIvG-fJGAtVwhGRg linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU -3e6377f5xwPfYZkPHPrDbEq1PRN7uQ linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/Makefile -3e6377f8Me8IqtvEhb70XFgOvqQH7A linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c -4083dc16z0jvZEH4PiVDbDRreaNp6w linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/Makefile -4083dc16KQus88a4U3uCV6qVCA6_8Q linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/Makefile -4075806dI5kfeMD5RV-DA0PYoThx_w linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile -4075806d4-j7vN0Mn0bklI1cRUX1vQ linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h -4075806dibjCcfuXv6CINMhxWTw3jQ linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c -3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ linux-2.4.26-xen-sparse/arch/xen/drivers/console/Makefile -3e5a4e656nfFISThfbyXQOA6HN6YHw linux-2.4.26-xen-sparse/arch/xen/drivers/dom0/Makefile -40420a6ebRqDjufoN1WSJvolEW2Wjw linux-2.4.26-xen-sparse/arch/xen/drivers/evtchn/Makefile -4083dc16-Kd5y9psK_yk161sme5j5Q linux-2.4.26-xen-sparse/arch/xen/drivers/netif/Makefile -4083dc16UmHXxS9g_UFVnkUpN-oP2Q linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/Makefile -405853f2wg7JXZJNltspMwOZJklxgw linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/Makefile -3e5a4e65lWzkiPXsZdzPt2RNnJGG1g linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile -3e5a4e65_hqfuxtGG8IUy6wRM86Ecg linux-2.4.26-xen-sparse/arch/xen/kernel/entry.S -3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg linux-2.4.26-xen-sparse/arch/xen/kernel/head.S -3e5a4e65RMGcuA-HCn3-wNx3fFQwdg linux-2.4.26-xen-sparse/arch/xen/kernel/i386_ksyms.c -3e5a4e653U6cELGv528IxOLHvCq8iA linux-2.4.26-xen-sparse/arch/xen/kernel/irq.c -3e5a4e65muT6SU3ck47IP87Q7Ti5hA linux-2.4.26-xen-sparse/arch/xen/kernel/ldt.c -4051db95N9N99FjsRwi49YKUNHWI8A linux-2.4.26-xen-sparse/arch/xen/kernel/pci-pc.c -3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ linux-2.4.26-xen-sparse/arch/xen/kernel/process.c -3e5a4e66tR-qJMLj3MppcKqmvuI2XQ linux-2.4.26-xen-sparse/arch/xen/kernel/setup.c -3e5a4e66fWSTagLGU2P8BGFGRjhDiw linux-2.4.26-xen-sparse/arch/xen/kernel/signal.c -3e5a4e66N__lUXNwzQ-eADRzK9LXuQ linux-2.4.26-xen-sparse/arch/xen/kernel/time.c -3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c -3e5a4e66-9_NczrVMbuQkoSLyXckIw linux-2.4.26-xen-sparse/arch/xen/lib/Makefile -3e5a4e6637ZDk0BvFEC-aFQs599-ng linux-2.4.26-xen-sparse/arch/xen/lib/delay.c -3e5a4e66croVgpcJyJuF2ycQw0HuJw linux-2.4.26-xen-sparse/arch/xen/mm/Makefile -3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg linux-2.4.26-xen-sparse/arch/xen/mm/fault.c -3e5a4e661gLzzff25pJooKIIWe7IWg linux-2.4.26-xen-sparse/arch/xen/mm/init.c -3f0bed43UUdQichXAiVNrjV-y2Kzcg linux-2.4.26-xen-sparse/arch/xen/mm/ioremap.c -3e5a4e66qRlSTcjafidMB6ulECADvg linux-2.4.26-xen-sparse/arch/xen/vmlinux.lds -3e5a4e66mrtlmV75L1tjKDg8RaM5gA linux-2.4.26-xen-sparse/drivers/block/ll_rw_blk.c -40d70c24-Dy2HUMrwSZagfXvAPnI4w linux-2.4.26-xen-sparse/drivers/char/Makefile -3f108aeaLcGDgQdFAANLTUEid0a05w linux-2.4.26-xen-sparse/drivers/char/mem.c -3e5a4e66rw65CxyolW9PKz4GG42RcA linux-2.4.26-xen-sparse/drivers/char/tty_io.c -40c9c0c1pPwYE3-4i-oI3ubUu7UgvQ linux-2.4.26-xen-sparse/drivers/scsi/aic7xxx/Makefile -3e5a4e669uzIE54VwucPYtGwXLAbzA linux-2.4.26-xen-sparse/fs/exec.c -3e5a4e66wbeCpsJgVf_U8Jde-CNcsA linux-2.4.26-xen-sparse/include/asm-xen/bugs.h -3e5a4e66HdSkvIV6SJ1evG_xmTmXHA linux-2.4.26-xen-sparse/include/asm-xen/desc.h -3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw linux-2.4.26-xen-sparse/include/asm-xen/fixmap.h -406aeeaaQvl4RNtmd9hDEugBURbFpQ linux-2.4.26-xen-sparse/include/asm-xen/highmem.h -3e5a4e67YtcyDLQsShhCfQwPSELfvA linux-2.4.26-xen-sparse/include/asm-xen/hw_irq.h -4060044fVx7-tokvNLKBf_6qBB4lqQ linux-2.4.26-xen-sparse/include/asm-xen/io.h -3e5a4e673p7PEOyHFm3nHkYX6HQYBg linux-2.4.26-xen-sparse/include/asm-xen/irq.h -40d70c240tW7TWArl1VUgIFH2nVO1A linux-2.4.26-xen-sparse/include/asm-xen/keyboard.h -3e5a4e678ddsQOpbSiRdy1GRcDc9WA linux-2.4.26-xen-sparse/include/asm-xen/mmu_context.h -40d06e5b2YWInUX1Xv9amVANwd_2Xg linux-2.4.26-xen-sparse/include/asm-xen/module.h -3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ linux-2.4.26-xen-sparse/include/asm-xen/msr.h -3e5a4e67mnQfh-R8KcQCaVo2Oho6yg linux-2.4.26-xen-sparse/include/asm-xen/page.h -409ba2e7ZfV5hqTvIzxLtpClnxtIzg linux-2.4.26-xen-sparse/include/asm-xen/pci.h -3e5a4e67uTYU5oEnIDjxuaez8njjqg linux-2.4.26-xen-sparse/include/asm-xen/pgalloc.h -3e5a4e67X7JyupgdYkgDX19Huj2sAw linux-2.4.26-xen-sparse/include/asm-xen/pgtable-2level.h -3e5a4e67gr4NLGtQ5CvSLimMYZlkOA linux-2.4.26-xen-sparse/include/asm-xen/pgtable.h -3e5a4e676uK4xErTBDH6XJREn9LSyg linux-2.4.26-xen-sparse/include/asm-xen/processor.h -41224663YBCUMX1kVo_HRUtgaHTi7w linux-2.4.26-xen-sparse/include/asm-xen/queues.h -3e5a4e68uJz-xI0IBVMD7xRLQKJDFg linux-2.4.26-xen-sparse/include/asm-xen/segment.h -3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA linux-2.4.26-xen-sparse/include/asm-xen/smp.h -4062f7e2PzFOUGT0PaE7A0VprTU3JQ linux-2.4.26-xen-sparse/include/asm-xen/synch_bitops.h -3e5a4e68mTr0zcp9SXDbnd-XLrrfxw linux-2.4.26-xen-sparse/include/asm-xen/system.h -3f1056a9L_kqHcFheV00KbKBzv9j5w linux-2.4.26-xen-sparse/include/asm-xen/vga.h -40659defgWA92arexpMGn8X3QMDj3w linux-2.4.26-xen-sparse/include/asm-xen/xor.h -3f056927gMHl7mWB89rb73JahbhQIA linux-2.4.26-xen-sparse/include/linux/blk.h -4124f66fPHG6yvB_vXmesjvzrJ3yMg linux-2.4.26-xen-sparse/include/linux/mm.h -401c0590D_kwJDU59X8NyvqSv_Cl2A linux-2.4.26-xen-sparse/include/linux/sched.h -40a248afgI0_JKthdYAe8beVfXSTpQ linux-2.4.26-xen-sparse/include/linux/skbuff.h -401c0592pLrp_aCbQRo9GXiYQQaVVA linux-2.4.26-xen-sparse/include/linux/timer.h -3f9d4b44247udoqWEgFkaHiWv6Uvyg linux-2.4.26-xen-sparse/kernel/time.c -401c059bjLBFYHRD4Py2uM3eA1D4zQ linux-2.4.26-xen-sparse/kernel/timer.c -3e6e7c1efbQe93xCvOpOVCnXTMmQ5w linux-2.4.26-xen-sparse/mkbuildtree -406aeeafkrnCuIVWLFv3kfn4uAD5Eg linux-2.4.26-xen-sparse/mm/highmem.c -3e5a4e68GxCIaFH4sy01v1wjapetaA linux-2.4.26-xen-sparse/mm/memory.c -3f108af5VxPkLv13tXpXgoRKALQtXQ linux-2.4.26-xen-sparse/mm/mprotect.c -3e5a4e681xMPdF9xCMwpyfuYMySU5g linux-2.4.26-xen-sparse/mm/mremap.c -409ba2e7akOFqQUg6Qyg2s28xcXiMg linux-2.4.26-xen-sparse/mm/page_alloc.c -3e5a4e683HKVU-sxtagrDasRB8eBVw linux-2.4.26-xen-sparse/mm/swapfile.c -41180721bNns9Na7w1nJ0ZVt8bhUNA linux-2.4.26-xen-sparse/mm/vmalloc.c +3e5a4e6589G-U42lFKs43plskXoFxQ linux-2.4.27-xen-sparse/Makefile +3e5a4e65IEPjnWPZ5w3TxS5scV8Ewg linux-2.4.27-xen-sparse/arch/xen/Makefile +3e5a4e65n-KhsEAs-A4ULiStBp-r6w linux-2.4.27-xen-sparse/arch/xen/boot/Makefile +3e5a4e65OV_j_DBtjzt5vej771AJsA linux-2.4.27-xen-sparse/arch/xen/config.in +40648526SxcA4lGIHB_k7ID8VlRSzw linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 +40c73c77QesbL7eIvG-fJGAtVwhGRg linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU +3e6377f5xwPfYZkPHPrDbEq1PRN7uQ linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/Makefile +3e6377f8Me8IqtvEhb70XFgOvqQH7A linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c +4083dc16z0jvZEH4PiVDbDRreaNp6w linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile +4083dc16KQus88a4U3uCV6qVCA6_8Q linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/backend/Makefile +4075806dI5kfeMD5RV-DA0PYoThx_w linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile +4075806d4-j7vN0Mn0bklI1cRUX1vQ linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h +4075806dibjCcfuXv6CINMhxWTw3jQ linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c +3e5a4e65G3e2s0ghPMgiJ-gBTUJ0uQ linux-2.4.27-xen-sparse/arch/xen/drivers/console/Makefile +3e5a4e656nfFISThfbyXQOA6HN6YHw linux-2.4.27-xen-sparse/arch/xen/drivers/dom0/Makefile +40420a6ebRqDjufoN1WSJvolEW2Wjw linux-2.4.27-xen-sparse/arch/xen/drivers/evtchn/Makefile +4083dc16-Kd5y9psK_yk161sme5j5Q linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile +4083dc16UmHXxS9g_UFVnkUpN-oP2Q linux-2.4.27-xen-sparse/arch/xen/drivers/netif/backend/Makefile +405853f2wg7JXZJNltspMwOZJklxgw linux-2.4.27-xen-sparse/arch/xen/drivers/netif/frontend/Makefile +3e5a4e65lWzkiPXsZdzPt2RNnJGG1g linux-2.4.27-xen-sparse/arch/xen/kernel/Makefile +3e5a4e65_hqfuxtGG8IUy6wRM86Ecg linux-2.4.27-xen-sparse/arch/xen/kernel/entry.S +3e5a4e65Hy_1iUvMTPsNqGNXd9uFpg linux-2.4.27-xen-sparse/arch/xen/kernel/head.S +3e5a4e65RMGcuA-HCn3-wNx3fFQwdg linux-2.4.27-xen-sparse/arch/xen/kernel/i386_ksyms.c +3e5a4e653U6cELGv528IxOLHvCq8iA linux-2.4.27-xen-sparse/arch/xen/kernel/irq.c +3e5a4e65muT6SU3ck47IP87Q7Ti5hA linux-2.4.27-xen-sparse/arch/xen/kernel/ldt.c +4051db95N9N99FjsRwi49YKUNHWI8A linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c +3e5a4e65IGt3WwQDNiL4h-gYWgNTWQ linux-2.4.27-xen-sparse/arch/xen/kernel/process.c +3e5a4e66tR-qJMLj3MppcKqmvuI2XQ linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c +3e5a4e66fWSTagLGU2P8BGFGRjhDiw linux-2.4.27-xen-sparse/arch/xen/kernel/signal.c +3e5a4e66N__lUXNwzQ-eADRzK9LXuQ linux-2.4.27-xen-sparse/arch/xen/kernel/time.c +3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ linux-2.4.27-xen-sparse/arch/xen/kernel/traps.c +3e5a4e66-9_NczrVMbuQkoSLyXckIw linux-2.4.27-xen-sparse/arch/xen/lib/Makefile +3e5a4e6637ZDk0BvFEC-aFQs599-ng linux-2.4.27-xen-sparse/arch/xen/lib/delay.c +3e5a4e66croVgpcJyJuF2ycQw0HuJw linux-2.4.27-xen-sparse/arch/xen/mm/Makefile +3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg linux-2.4.27-xen-sparse/arch/xen/mm/fault.c +3e5a4e661gLzzff25pJooKIIWe7IWg linux-2.4.27-xen-sparse/arch/xen/mm/init.c +3f0bed43UUdQichXAiVNrjV-y2Kzcg linux-2.4.27-xen-sparse/arch/xen/mm/ioremap.c +3e5a4e66qRlSTcjafidMB6ulECADvg linux-2.4.27-xen-sparse/arch/xen/vmlinux.lds +3e5a4e66mrtlmV75L1tjKDg8RaM5gA linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c +40d70c24-Dy2HUMrwSZagfXvAPnI4w linux-2.4.27-xen-sparse/drivers/char/Makefile +3f108aeaLcGDgQdFAANLTUEid0a05w linux-2.4.27-xen-sparse/drivers/char/mem.c +3e5a4e66rw65CxyolW9PKz4GG42RcA linux-2.4.27-xen-sparse/drivers/char/tty_io.c +40c9c0c1pPwYE3-4i-oI3ubUu7UgvQ linux-2.4.27-xen-sparse/drivers/scsi/aic7xxx/Makefile +3e5a4e669uzIE54VwucPYtGwXLAbzA linux-2.4.27-xen-sparse/fs/exec.c +3e5a4e66wbeCpsJgVf_U8Jde-CNcsA linux-2.4.27-xen-sparse/include/asm-xen/bugs.h +3e5a4e66HdSkvIV6SJ1evG_xmTmXHA linux-2.4.27-xen-sparse/include/asm-xen/desc.h +3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw linux-2.4.27-xen-sparse/include/asm-xen/fixmap.h +406aeeaaQvl4RNtmd9hDEugBURbFpQ linux-2.4.27-xen-sparse/include/asm-xen/highmem.h +3e5a4e67YtcyDLQsShhCfQwPSELfvA linux-2.4.27-xen-sparse/include/asm-xen/hw_irq.h +4060044fVx7-tokvNLKBf_6qBB4lqQ linux-2.4.27-xen-sparse/include/asm-xen/io.h +3e5a4e673p7PEOyHFm3nHkYX6HQYBg linux-2.4.27-xen-sparse/include/asm-xen/irq.h +40d70c240tW7TWArl1VUgIFH2nVO1A linux-2.4.27-xen-sparse/include/asm-xen/keyboard.h +3e5a4e678ddsQOpbSiRdy1GRcDc9WA linux-2.4.27-xen-sparse/include/asm-xen/mmu_context.h +40d06e5b2YWInUX1Xv9amVANwd_2Xg linux-2.4.27-xen-sparse/include/asm-xen/module.h +3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ linux-2.4.27-xen-sparse/include/asm-xen/msr.h +3e5a4e67mnQfh-R8KcQCaVo2Oho6yg linux-2.4.27-xen-sparse/include/asm-xen/page.h +409ba2e7ZfV5hqTvIzxLtpClnxtIzg linux-2.4.27-xen-sparse/include/asm-xen/pci.h +3e5a4e67uTYU5oEnIDjxuaez8njjqg linux-2.4.27-xen-sparse/include/asm-xen/pgalloc.h +3e5a4e67X7JyupgdYkgDX19Huj2sAw linux-2.4.27-xen-sparse/include/asm-xen/pgtable-2level.h +3e5a4e67gr4NLGtQ5CvSLimMYZlkOA linux-2.4.27-xen-sparse/include/asm-xen/pgtable.h +3e5a4e676uK4xErTBDH6XJREn9LSyg linux-2.4.27-xen-sparse/include/asm-xen/processor.h +41224663YBCUMX1kVo_HRUtgaHTi7w linux-2.4.27-xen-sparse/include/asm-xen/queues.h +3e5a4e68uJz-xI0IBVMD7xRLQKJDFg linux-2.4.27-xen-sparse/include/asm-xen/segment.h +3e5a4e68Nfdh6QcOKUTGCaYkf2LmYA linux-2.4.27-xen-sparse/include/asm-xen/smp.h +4062f7e2PzFOUGT0PaE7A0VprTU3JQ linux-2.4.27-xen-sparse/include/asm-xen/synch_bitops.h +3e5a4e68mTr0zcp9SXDbnd-XLrrfxw linux-2.4.27-xen-sparse/include/asm-xen/system.h +3f1056a9L_kqHcFheV00KbKBzv9j5w linux-2.4.27-xen-sparse/include/asm-xen/vga.h +40659defgWA92arexpMGn8X3QMDj3w linux-2.4.27-xen-sparse/include/asm-xen/xor.h +3f056927gMHl7mWB89rb73JahbhQIA linux-2.4.27-xen-sparse/include/linux/blk.h +4124f66fPHG6yvB_vXmesjvzrJ3yMg linux-2.4.27-xen-sparse/include/linux/mm.h +401c0590D_kwJDU59X8NyvqSv_Cl2A linux-2.4.27-xen-sparse/include/linux/sched.h +40a248afgI0_JKthdYAe8beVfXSTpQ linux-2.4.27-xen-sparse/include/linux/skbuff.h +401c0592pLrp_aCbQRo9GXiYQQaVVA linux-2.4.27-xen-sparse/include/linux/timer.h +3f9d4b44247udoqWEgFkaHiWv6Uvyg linux-2.4.27-xen-sparse/kernel/time.c +401c059bjLBFYHRD4Py2uM3eA1D4zQ linux-2.4.27-xen-sparse/kernel/timer.c +3e6e7c1efbQe93xCvOpOVCnXTMmQ5w linux-2.4.27-xen-sparse/mkbuildtree +406aeeafkrnCuIVWLFv3kfn4uAD5Eg linux-2.4.27-xen-sparse/mm/highmem.c +3e5a4e68GxCIaFH4sy01v1wjapetaA linux-2.4.27-xen-sparse/mm/memory.c +3f108af5VxPkLv13tXpXgoRKALQtXQ linux-2.4.27-xen-sparse/mm/mprotect.c +3e5a4e681xMPdF9xCMwpyfuYMySU5g linux-2.4.27-xen-sparse/mm/mremap.c +409ba2e7akOFqQUg6Qyg2s28xcXiMg linux-2.4.27-xen-sparse/mm/page_alloc.c +3e5a4e683HKVU-sxtagrDasRB8eBVw linux-2.4.27-xen-sparse/mm/swapfile.c +41180721bNns9Na7w1nJ0ZVt8bhUNA linux-2.4.27-xen-sparse/mm/vmalloc.c 40f562372u3A7_kfbYYixPHJJxYUxA linux-2.6.7-xen-sparse/arch/xen/Kconfig 40f56237utH41NPukqHksuNf29IC9A linux-2.6.7-xen-sparse/arch/xen/Kconfig.drivers 40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.7-xen-sparse/arch/xen/Makefile diff --git a/Makefile b/Makefile index 6722b9c6e0..dace27825d 100644 --- a/Makefile +++ b/Makefile @@ -45,16 +45,17 @@ ifeq ($(LINUX_SRC),) LINUX_SRC := ./linux-$(LINUX_VER).tar.bz2 endif -patches/ebtables-brnf-5_vs_2.4.25.diff: +patches/ebtables.diff: mkdir -p patches - wget $(SOURCEFORGE_MIRROR)/ebtables/ebtables-brnf-5_vs_2.4.25.diff.gz \ + #wget $(SOURCEFORGE_MIRROR)/ebtables/ebtables-brnf-5_vs_2.4.25.diff.gz \ -O- | gunzip -c > $@ + wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@ LINUX_TREES := linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU # make a linux-xen build tree from a pristine kernel plus sparse tree ifeq ($(LINUX_RELEASE),2.4) -mk-linux-trees: patches/ebtables-brnf-5_vs_2.4.25.diff pristine-linux-src +mk-linux-trees: patches/ebtables.diff pristine-linux-src $(RM) -rf $(LINUX_TREES) echo $(LINUX_SRC) | grep -q bz2 && \ tar -jxf $(LINUX_SRC) || tar -zxf $(LINUX_SRC) @@ -63,7 +64,7 @@ mk-linux-trees: patches/ebtables-brnf-5_vs_2.4.25.diff pristine-linux-src ./mkbuildtree ../linux-$(LINUX_VER)-xen0 ) cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU ( cd linux-$(LINUX_VER)-xen0 ; \ - patch -p1 -F3 < ../patches/ebtables-brnf-5_vs_2.4.25.diff ) + patch -p1 -F3 < ../patches/ebtables.diff ) else mk-linux-trees: pristine-linux-src $(RM) -rf $(LINUX_TREES) diff --git a/linux-2.4.26-xen-sparse/Makefile b/linux-2.4.27-xen-sparse/Makefile similarity index 99% rename from linux-2.4.26-xen-sparse/Makefile rename to linux-2.4.27-xen-sparse/Makefile index 797fdc98e9..73d5da2372 100644 --- a/linux-2.4.26-xen-sparse/Makefile +++ b/linux-2.4.27-xen-sparse/Makefile @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 4 -SUBLEVEL = 26 +SUBLEVEL = 27 EXTRAVERSION = KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -186,6 +186,7 @@ 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_I2C) += drivers/i2c/i2c.o DRIVERS-$(CONFIG_VT) += drivers/video/video.o DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o @@ -197,7 +198,6 @@ DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o DRIVERS-$(CONFIG_HIL) += drivers/hil/hil.o DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o -DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o DRIVERS-$(CONFIG_GSC) += drivers/gsc/gscbus.o diff --git a/linux-2.4.26-xen-sparse/arch/xen/Makefile b/linux-2.4.27-xen-sparse/arch/xen/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/boot/Makefile b/linux-2.4.27-xen-sparse/arch/xen/boot/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/boot/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/boot/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/config.in b/linux-2.4.27-xen-sparse/arch/xen/config.in similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/config.in rename to linux-2.4.27-xen-sparse/arch/xen/config.in diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 similarity index 93% rename from linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 rename to linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 index 06ae1e972c..1f0dcfc70d 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xen0 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_XEN=y CONFIG_X86=y @@ -72,6 +72,10 @@ CONFIG_HOTPLUG=y # CONFIG_HOTPLUG_PCI is not set # CONFIG_HOTPLUG_PCI_COMPAQ is not set # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set +# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set +# CONFIG_HOTPLUG_PCI_PCIE is not set +# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y @@ -110,6 +114,7 @@ CONFIG_PNP=y # CONFIG_CISS_MONITOR_THREAD is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y @@ -155,11 +160,11 @@ CONFIG_IP_PNP_DHCP=y # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=y -CONFIG_IP_NF_FTP=y +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m # CONFIG_IP_NF_AMANDA is not set -CONFIG_IP_NF_TFTP=y -CONFIG_IP_NF_IRC=y +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_IRC=m # CONFIG_IP_NF_QUEUE is not set CONFIG_IP_NF_IPTABLES=y # CONFIG_IP_NF_MATCH_LIMIT is not set @@ -176,23 +181,23 @@ CONFIG_IP_NF_IPTABLES=y # CONFIG_IP_NF_MATCH_TTL is not set # CONFIG_IP_NF_MATCH_TCPMSS is not set # CONFIG_IP_NF_MATCH_HELPER is not set -CONFIG_IP_NF_MATCH_STATE=y -CONFIG_IP_NF_MATCH_CONNTRACK=y +CONFIG_IP_NF_MATCH_STATE=m +CONFIG_IP_NF_MATCH_CONNTRACK=m # CONFIG_IP_NF_MATCH_UNCLEAN is not set # CONFIG_IP_NF_MATCH_OWNER is not set CONFIG_IP_NF_MATCH_PHYSDEV=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y # CONFIG_IP_NF_TARGET_MIRROR is not set -CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_NAT=m CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=y -CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m # CONFIG_IP_NF_NAT_LOCAL is not set # CONFIG_IP_NF_NAT_SNMP_BASIC is not set -CONFIG_IP_NF_NAT_IRC=y -CONFIG_IP_NF_NAT_FTP=y -CONFIG_IP_NF_NAT_TFTP=y +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m # CONFIG_IP_NF_MANGLE is not set CONFIG_IP_NF_TARGET_LOG=y CONFIG_IP_NF_TARGET_ULOG=y @@ -212,10 +217,6 @@ CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -225,25 +226,25 @@ CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_DEV_APPLETALK is not set # CONFIG_DECNET is not set CONFIG_BRIDGE=y -# CONFIG_BRIDGE_NF_EBTABLES is not set -# CONFIG_BRIDGE_EBT_T_FILTER is not set -# CONFIG_BRIDGE_EBT_T_NAT is not set -# CONFIG_BRIDGE_EBT_BROUTE is not set -# CONFIG_BRIDGE_EBT_LOG is not set -# CONFIG_BRIDGE_EBT_IPF is not set -# CONFIG_BRIDGE_EBT_ARPF is not set -# CONFIG_BRIDGE_EBT_AMONG is not set -# CONFIG_BRIDGE_EBT_LIMIT is not set -# CONFIG_BRIDGE_EBT_VLANF is not set -# CONFIG_BRIDGE_EBT_802_3 is not set -# CONFIG_BRIDGE_EBT_PKTTYPE is not set -# CONFIG_BRIDGE_EBT_STP is not set -# CONFIG_BRIDGE_EBT_MARKF is not set -# CONFIG_BRIDGE_EBT_ARPREPLY is not set -# CONFIG_BRIDGE_EBT_SNAT is not set -# CONFIG_BRIDGE_EBT_DNAT is not set -# CONFIG_BRIDGE_EBT_REDIRECT is not set -# CONFIG_BRIDGE_EBT_MARK_T is not set +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_IPF=m +CONFIG_BRIDGE_EBT_ARPF=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_VLANF=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_MARKF=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_MARK_T=m # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_LLC is not set @@ -272,10 +273,6 @@ CONFIG_IDE=y # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y @@ -287,10 +284,6 @@ CONFIG_BLK_DEV_IDETAPE=y CONFIG_BLK_DEV_IDEFLOPPY=y CONFIG_BLK_DEV_IDESCSI=y CONFIG_IDE_TASK_IOCTL=y - -# -# IDE chipset support/bugfixes -# CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_CMD640_ENHANCED=y # CONFIG_BLK_DEV_ISAPNP is not set @@ -334,10 +327,6 @@ CONFIG_BLK_DEV_SLC90E66=y CONFIG_BLK_DEV_TRM290=y CONFIG_BLK_DEV_VIA82CXXX=y CONFIG_IDE_CHIPSETS=y - -# -# Note: most of these also require special kernel boot parameters -# # CONFIG_BLK_DEV_4DRIVES is not set # CONFIG_BLK_DEV_ALI14XX is not set # CONFIG_BLK_DEV_DTC2278 is not set @@ -359,20 +348,12 @@ CONFIG_BLK_DEV_PDC202XX=y # SCSI support # CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set CONFIG_CHR_DEV_SG=y - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set @@ -410,6 +391,14 @@ CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_SCSI_AM53C974 is not set CONFIG_SCSI_MEGARAID=y # CONFIG_SCSI_MEGARAID2 is not set +CONFIG_SCSI_SATA=y +# CONFIG_SCSI_SATA_SVW is not set +CONFIG_SCSI_SATA_PROMISE=y +CONFIG_SCSI_SATA_SX4=y +CONFIG_SCSI_SATA_SIL=y +CONFIG_SCSI_SATA_SIS=y +CONFIG_SCSI_SATA_VIA=y +CONFIG_SCSI_SATA_VITESSE=y CONFIG_SCSI_BUSLOGIC=y # CONFIG_SCSI_OMIT_FLASHPOINT is not set # CONFIG_SCSI_CPQFCTS is not set @@ -651,14 +640,6 @@ CONFIG_PSMOUSE=y # Joysticks # # CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# # CONFIG_QIC02_TAPE is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_PANIC_EVENT is not set @@ -921,8 +902,10 @@ CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m +# CONFIG_CRYPTO_TEA is not set CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_TEST is not set # diff --git a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU similarity index 97% rename from linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU rename to linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU index 9d5fdccdf8..e31d05679e 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU @@ -53,6 +53,7 @@ CONFIG_X86_TSC=y CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set +CONFIG_FORCE_MAX_ZONEORDER=11 # # General setup @@ -223,6 +224,14 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_AM53C974 is not set # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_SATA_SVW is not set +# CONFIG_SCSI_SATA_PROMISE is not set +# CONFIG_SCSI_SATA_SX4 is not set +# CONFIG_SCSI_SATA_SIL is not set +# CONFIG_SCSI_SATA_SIS is not set +# CONFIG_SCSI_SATA_VIA is not set +# CONFIG_SCSI_SATA_VITESSE is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_DTC3280 is not set diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c b/linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c rename to linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/backend/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/backend/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/common.h rename to linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c rename to linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/console/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/console/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/console/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/console/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/dom0/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/dom0/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/dom0/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/dom0/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/evtchn/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/evtchn/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/evtchn/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/evtchn/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/netif/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/backend/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/netif/backend/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/Makefile b/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/frontend/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/drivers/netif/frontend/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/drivers/netif/frontend/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile b/linux-2.4.27-xen-sparse/arch/xen/kernel/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/kernel/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/entry.S b/linux-2.4.27-xen-sparse/arch/xen/kernel/entry.S similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/entry.S rename to linux-2.4.27-xen-sparse/arch/xen/kernel/entry.S diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/head.S b/linux-2.4.27-xen-sparse/arch/xen/kernel/head.S similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/head.S rename to linux-2.4.27-xen-sparse/arch/xen/kernel/head.S diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/i386_ksyms.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/i386_ksyms.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/i386_ksyms.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/i386_ksyms.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/irq.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/irq.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/irq.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/irq.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/ldt.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/ldt.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/ldt.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/ldt.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/pci-pc.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/pci-pc.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/process.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/process.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/process.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/setup.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/signal.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/signal.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/signal.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/signal.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/time.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/time.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/time.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/traps.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c rename to linux-2.4.27-xen-sparse/arch/xen/kernel/traps.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/lib/Makefile b/linux-2.4.27-xen-sparse/arch/xen/lib/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/lib/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/lib/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/lib/delay.c b/linux-2.4.27-xen-sparse/arch/xen/lib/delay.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/lib/delay.c rename to linux-2.4.27-xen-sparse/arch/xen/lib/delay.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/mm/Makefile b/linux-2.4.27-xen-sparse/arch/xen/mm/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/mm/Makefile rename to linux-2.4.27-xen-sparse/arch/xen/mm/Makefile diff --git a/linux-2.4.26-xen-sparse/arch/xen/mm/fault.c b/linux-2.4.27-xen-sparse/arch/xen/mm/fault.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/mm/fault.c rename to linux-2.4.27-xen-sparse/arch/xen/mm/fault.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/mm/init.c b/linux-2.4.27-xen-sparse/arch/xen/mm/init.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/mm/init.c rename to linux-2.4.27-xen-sparse/arch/xen/mm/init.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/mm/ioremap.c b/linux-2.4.27-xen-sparse/arch/xen/mm/ioremap.c similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/mm/ioremap.c rename to linux-2.4.27-xen-sparse/arch/xen/mm/ioremap.c diff --git a/linux-2.4.26-xen-sparse/arch/xen/vmlinux.lds b/linux-2.4.27-xen-sparse/arch/xen/vmlinux.lds similarity index 100% rename from linux-2.4.26-xen-sparse/arch/xen/vmlinux.lds rename to linux-2.4.27-xen-sparse/arch/xen/vmlinux.lds diff --git a/linux-2.4.26-xen-sparse/drivers/block/ll_rw_blk.c b/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c similarity index 100% rename from linux-2.4.26-xen-sparse/drivers/block/ll_rw_blk.c rename to linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c diff --git a/linux-2.4.26-xen-sparse/drivers/char/Makefile b/linux-2.4.27-xen-sparse/drivers/char/Makefile similarity index 99% rename from linux-2.4.26-xen-sparse/drivers/char/Makefile rename to linux-2.4.27-xen-sparse/drivers/char/Makefile index e882884a61..583a17f1fa 100644 --- a/linux-2.4.26-xen-sparse/drivers/char/Makefile +++ b/linux-2.4.27-xen-sparse/drivers/char/Makefile @@ -177,6 +177,7 @@ endif obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o obj-$(CONFIG_SERIAL) += $(SERIAL) +obj-$(CONFIG_PARPORT_SERIAL) += parport_serial.o obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o obj-$(CONFIG_SERIAL_21285) += serial_21285.o obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o @@ -326,7 +327,6 @@ obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o -obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o diff --git a/linux-2.4.26-xen-sparse/drivers/char/mem.c b/linux-2.4.27-xen-sparse/drivers/char/mem.c similarity index 99% rename from linux-2.4.26-xen-sparse/drivers/char/mem.c rename to linux-2.4.27-xen-sparse/drivers/char/mem.c index f0d8502190..04a1d0228b 100644 --- a/linux-2.4.26-xen-sparse/drivers/char/mem.c +++ b/linux-2.4.27-xen-sparse/drivers/char/mem.c @@ -78,7 +78,7 @@ static ssize_t do_write_mem(struct file * file, void *p, unsigned long realp, if (copy_from_user(p, buf, count)) return -EFAULT; written += count; - *ppos += written; + *ppos = realp + written; return written; } @@ -119,7 +119,7 @@ static ssize_t read_mem(struct file * file, char * buf, if (copy_to_user(buf, __va(p), count)) return -EFAULT; read += count; - *ppos += read; + *ppos = p + read; return read; } diff --git a/linux-2.4.26-xen-sparse/drivers/char/tty_io.c b/linux-2.4.27-xen-sparse/drivers/char/tty_io.c similarity index 100% rename from linux-2.4.26-xen-sparse/drivers/char/tty_io.c rename to linux-2.4.27-xen-sparse/drivers/char/tty_io.c diff --git a/linux-2.4.26-xen-sparse/drivers/scsi/aic7xxx/Makefile b/linux-2.4.27-xen-sparse/drivers/scsi/aic7xxx/Makefile similarity index 100% rename from linux-2.4.26-xen-sparse/drivers/scsi/aic7xxx/Makefile rename to linux-2.4.27-xen-sparse/drivers/scsi/aic7xxx/Makefile diff --git a/linux-2.4.26-xen-sparse/fs/exec.c b/linux-2.4.27-xen-sparse/fs/exec.c similarity index 100% rename from linux-2.4.26-xen-sparse/fs/exec.c rename to linux-2.4.27-xen-sparse/fs/exec.c diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/bugs.h b/linux-2.4.27-xen-sparse/include/asm-xen/bugs.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/bugs.h rename to linux-2.4.27-xen-sparse/include/asm-xen/bugs.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/desc.h b/linux-2.4.27-xen-sparse/include/asm-xen/desc.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/desc.h rename to linux-2.4.27-xen-sparse/include/asm-xen/desc.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/fixmap.h b/linux-2.4.27-xen-sparse/include/asm-xen/fixmap.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/fixmap.h rename to linux-2.4.27-xen-sparse/include/asm-xen/fixmap.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/highmem.h b/linux-2.4.27-xen-sparse/include/asm-xen/highmem.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/highmem.h rename to linux-2.4.27-xen-sparse/include/asm-xen/highmem.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/hw_irq.h b/linux-2.4.27-xen-sparse/include/asm-xen/hw_irq.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/hw_irq.h rename to linux-2.4.27-xen-sparse/include/asm-xen/hw_irq.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/io.h b/linux-2.4.27-xen-sparse/include/asm-xen/io.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/io.h rename to linux-2.4.27-xen-sparse/include/asm-xen/io.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/irq.h b/linux-2.4.27-xen-sparse/include/asm-xen/irq.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/irq.h rename to linux-2.4.27-xen-sparse/include/asm-xen/irq.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/keyboard.h b/linux-2.4.27-xen-sparse/include/asm-xen/keyboard.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/keyboard.h rename to linux-2.4.27-xen-sparse/include/asm-xen/keyboard.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/mmu_context.h b/linux-2.4.27-xen-sparse/include/asm-xen/mmu_context.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/mmu_context.h rename to linux-2.4.27-xen-sparse/include/asm-xen/mmu_context.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/module.h b/linux-2.4.27-xen-sparse/include/asm-xen/module.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/module.h rename to linux-2.4.27-xen-sparse/include/asm-xen/module.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/msr.h b/linux-2.4.27-xen-sparse/include/asm-xen/msr.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/msr.h rename to linux-2.4.27-xen-sparse/include/asm-xen/msr.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/page.h b/linux-2.4.27-xen-sparse/include/asm-xen/page.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/page.h rename to linux-2.4.27-xen-sparse/include/asm-xen/page.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/pci.h b/linux-2.4.27-xen-sparse/include/asm-xen/pci.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/pci.h rename to linux-2.4.27-xen-sparse/include/asm-xen/pci.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/pgalloc.h b/linux-2.4.27-xen-sparse/include/asm-xen/pgalloc.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/pgalloc.h rename to linux-2.4.27-xen-sparse/include/asm-xen/pgalloc.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/pgtable-2level.h b/linux-2.4.27-xen-sparse/include/asm-xen/pgtable-2level.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/pgtable-2level.h rename to linux-2.4.27-xen-sparse/include/asm-xen/pgtable-2level.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/pgtable.h b/linux-2.4.27-xen-sparse/include/asm-xen/pgtable.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/pgtable.h rename to linux-2.4.27-xen-sparse/include/asm-xen/pgtable.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/processor.h b/linux-2.4.27-xen-sparse/include/asm-xen/processor.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/processor.h rename to linux-2.4.27-xen-sparse/include/asm-xen/processor.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/queues.h b/linux-2.4.27-xen-sparse/include/asm-xen/queues.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/queues.h rename to linux-2.4.27-xen-sparse/include/asm-xen/queues.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/segment.h b/linux-2.4.27-xen-sparse/include/asm-xen/segment.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/segment.h rename to linux-2.4.27-xen-sparse/include/asm-xen/segment.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/smp.h b/linux-2.4.27-xen-sparse/include/asm-xen/smp.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/smp.h rename to linux-2.4.27-xen-sparse/include/asm-xen/smp.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/synch_bitops.h b/linux-2.4.27-xen-sparse/include/asm-xen/synch_bitops.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/synch_bitops.h rename to linux-2.4.27-xen-sparse/include/asm-xen/synch_bitops.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/system.h b/linux-2.4.27-xen-sparse/include/asm-xen/system.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/system.h rename to linux-2.4.27-xen-sparse/include/asm-xen/system.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/vga.h b/linux-2.4.27-xen-sparse/include/asm-xen/vga.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/vga.h rename to linux-2.4.27-xen-sparse/include/asm-xen/vga.h diff --git a/linux-2.4.26-xen-sparse/include/asm-xen/xor.h b/linux-2.4.27-xen-sparse/include/asm-xen/xor.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/asm-xen/xor.h rename to linux-2.4.27-xen-sparse/include/asm-xen/xor.h diff --git a/linux-2.4.26-xen-sparse/include/linux/blk.h b/linux-2.4.27-xen-sparse/include/linux/blk.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/linux/blk.h rename to linux-2.4.27-xen-sparse/include/linux/blk.h diff --git a/linux-2.4.26-xen-sparse/include/linux/mm.h b/linux-2.4.27-xen-sparse/include/linux/mm.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/linux/mm.h rename to linux-2.4.27-xen-sparse/include/linux/mm.h diff --git a/linux-2.4.26-xen-sparse/include/linux/sched.h b/linux-2.4.27-xen-sparse/include/linux/sched.h similarity index 99% rename from linux-2.4.26-xen-sparse/include/linux/sched.h rename to linux-2.4.27-xen-sparse/include/linux/sched.h index 1ac29aa143..73ac9b3fe4 100644 --- a/linux-2.4.26-xen-sparse/include/linux/sched.h +++ b/linux-2.4.27-xen-sparse/include/linux/sched.h @@ -276,9 +276,9 @@ struct user_struct { }; #define get_current_user() ({ \ - struct user_struct *__user = current->user; \ - atomic_inc(&__user->__count); \ - __user; }) + struct user_struct *__tmp_user = current->user; \ + atomic_inc(&__tmp_user->__count); \ + __tmp_user; }) extern struct user_struct root_user; #define INIT_USER (&root_user) diff --git a/linux-2.4.26-xen-sparse/include/linux/skbuff.h b/linux-2.4.27-xen-sparse/include/linux/skbuff.h similarity index 99% rename from linux-2.4.26-xen-sparse/include/linux/skbuff.h rename to linux-2.4.27-xen-sparse/include/linux/skbuff.h index 8c2b49b03e..9698aa216c 100644 --- a/linux-2.4.26-xen-sparse/include/linux/skbuff.h +++ b/linux-2.4.27-xen-sparse/include/linux/skbuff.h @@ -1168,7 +1168,18 @@ nf_conntrack_get(struct nf_ct_info *nfct) if (nfct) atomic_inc(&nfct->master->use); } +static inline void +nf_reset(struct sk_buff *skb) +{ + nf_conntrack_put(skb->nfct); + skb->nfct = NULL; +#ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; #endif +} +#else /* CONFIG_NETFILTER */ +static inline void nf_reset(struct sk_buff *skb) {} +#endif /* CONFIG_NETFILTER */ #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */ diff --git a/linux-2.4.26-xen-sparse/include/linux/timer.h b/linux-2.4.27-xen-sparse/include/linux/timer.h similarity index 100% rename from linux-2.4.26-xen-sparse/include/linux/timer.h rename to linux-2.4.27-xen-sparse/include/linux/timer.h diff --git a/linux-2.4.26-xen-sparse/kernel/time.c b/linux-2.4.27-xen-sparse/kernel/time.c similarity index 100% rename from linux-2.4.26-xen-sparse/kernel/time.c rename to linux-2.4.27-xen-sparse/kernel/time.c diff --git a/linux-2.4.26-xen-sparse/kernel/timer.c b/linux-2.4.27-xen-sparse/kernel/timer.c similarity index 100% rename from linux-2.4.26-xen-sparse/kernel/timer.c rename to linux-2.4.27-xen-sparse/kernel/timer.c diff --git a/linux-2.4.26-xen-sparse/mkbuildtree b/linux-2.4.27-xen-sparse/mkbuildtree similarity index 100% rename from linux-2.4.26-xen-sparse/mkbuildtree rename to linux-2.4.27-xen-sparse/mkbuildtree diff --git a/linux-2.4.26-xen-sparse/mm/highmem.c b/linux-2.4.27-xen-sparse/mm/highmem.c similarity index 100% rename from linux-2.4.26-xen-sparse/mm/highmem.c rename to linux-2.4.27-xen-sparse/mm/highmem.c diff --git a/linux-2.4.26-xen-sparse/mm/memory.c b/linux-2.4.27-xen-sparse/mm/memory.c similarity index 100% rename from linux-2.4.26-xen-sparse/mm/memory.c rename to linux-2.4.27-xen-sparse/mm/memory.c diff --git a/linux-2.4.26-xen-sparse/mm/mprotect.c b/linux-2.4.27-xen-sparse/mm/mprotect.c similarity index 100% rename from linux-2.4.26-xen-sparse/mm/mprotect.c rename to linux-2.4.27-xen-sparse/mm/mprotect.c diff --git a/linux-2.4.26-xen-sparse/mm/mremap.c b/linux-2.4.27-xen-sparse/mm/mremap.c similarity index 100% rename from linux-2.4.26-xen-sparse/mm/mremap.c rename to linux-2.4.27-xen-sparse/mm/mremap.c diff --git a/linux-2.4.26-xen-sparse/mm/page_alloc.c b/linux-2.4.27-xen-sparse/mm/page_alloc.c similarity index 95% rename from linux-2.4.26-xen-sparse/mm/page_alloc.c rename to linux-2.4.27-xen-sparse/mm/page_alloc.c index fda37e1929..6b613a537a 100644 --- a/linux-2.4.26-xen-sparse/mm/page_alloc.c +++ b/linux-2.4.27-xen-sparse/mm/page_alloc.c @@ -46,6 +46,34 @@ static int lower_zone_reserve_ratio[MAX_NR_ZONES-1] = { 256, 32 }; int vm_gfp_debug = 0; +static void FASTCALL(__free_pages_ok (struct page *page, unsigned int order)); + +static spinlock_t free_pages_ok_no_irq_lock = SPIN_LOCK_UNLOCKED; +struct page * free_pages_ok_no_irq_head; + +static void do_free_pages_ok_no_irq(void * arg) +{ + struct page * page, * __page; + + spin_lock_irq(&free_pages_ok_no_irq_lock); + + page = free_pages_ok_no_irq_head; + free_pages_ok_no_irq_head = NULL; + + spin_unlock_irq(&free_pages_ok_no_irq_lock); + + while (page) { + __page = page; + page = page->next_hash; + __free_pages_ok(__page, __page->index); + } +} + +static struct tq_struct free_pages_ok_no_irq_task = { + .routine = do_free_pages_ok_no_irq, +}; + + /* * Temporary debugging check. */ @@ -81,7 +109,6 @@ int vm_gfp_debug = 0; * -- wli */ -static void FASTCALL(__free_pages_ok (struct page *page, unsigned int order)); static void __free_pages_ok (struct page *page, unsigned int order) { unsigned long index, page_idx, mask, flags; @@ -97,8 +124,20 @@ static void __free_pages_ok (struct page *page, unsigned int order) * a reference to a page in order to pin it for io. -ben */ if (PageLRU(page)) { - if (unlikely(in_interrupt())) - BUG(); + if (unlikely(in_interrupt())) { + unsigned long flags; + + spin_lock_irqsave(&free_pages_ok_no_irq_lock, flags); + page->next_hash = free_pages_ok_no_irq_head; + free_pages_ok_no_irq_head = page; + page->index = order; + + spin_unlock_irqrestore(&free_pages_ok_no_irq_lock, flags); + + schedule_task(&free_pages_ok_no_irq_task); + return; + } + lru_cache_del(page); } diff --git a/linux-2.4.26-xen-sparse/mm/swapfile.c b/linux-2.4.27-xen-sparse/mm/swapfile.c similarity index 100% rename from linux-2.4.26-xen-sparse/mm/swapfile.c rename to linux-2.4.27-xen-sparse/mm/swapfile.c diff --git a/linux-2.4.26-xen-sparse/mm/vmalloc.c b/linux-2.4.27-xen-sparse/mm/vmalloc.c similarity index 100% rename from linux-2.4.26-xen-sparse/mm/vmalloc.c rename to linux-2.4.27-xen-sparse/mm/vmalloc.c