direct-io.hg

changeset 6145:dc27fd3392b1

merge
author kaf24@firebug.cl.cam.ac.uk
date Sun Aug 14 08:09:06 2005 +0000 (2005-08-14)
parents 48da5e506589 6f6ed4689795
children 719841477514
files .hgignore linux-2.6-xen-sparse/arch/xen/i386/mm/highmem.c linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blkback/interface.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable-3level.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h linux-2.6-xen-sparse/include/linux/highmem.h linux-2.6-xen-sparse/mm/highmem.c tools/examples/network-bridge tools/examples/xend-config.sxp tools/libxc/Makefile tools/libxc/xc_core.c tools/libxc/xc_gnttab.c tools/libxc/xc_linux_build.c tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c tools/libxc/xc_load_elf.c tools/libxc/xc_ptrace.c tools/libxc/xc_vmx_build.c tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xend/server/controller.py tools/xenstore/xenstored_core.c xen/Rules.mk xen/arch/ia64/grant_table.c xen/arch/x86/mm.c xen/arch/x86/setup.c xen/arch/x86/traps.c xen/common/grant_table.c xen/common/perfc.c xen/include/asm-x86/mm.h xen/include/public/grant_table.h xen/include/xen/grant_table.h
line diff
    14.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h	Sat Aug 13 22:04:22 2005 +0000
    14.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h	Sun Aug 14 08:09:06 2005 +0000
    14.3 @@ -9,6 +9,7 @@
    14.4  #include <asm/fixmap.h>
    14.5  #include <asm/bitops.h>
    14.6  #include <linux/threads.h>
    14.7 +#include <linux/sched.h>
    14.8  #include <asm/pda.h>
    14.9  #ifdef CONFIG_XEN
   14.10  #include <asm-xen/hypervisor.h>