ia64/xen-unstable

changeset 6016:63995acdd34a

Merge,
author kaf24@firebug.cl.cam.ac.uk
date Wed Aug 03 09:35:16 2005 +0000 (2005-08-03)
parents 4012e919dac0 d3670ff9efff
children f294acb25858
files linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 linux-2.6-xen-sparse/include/asm-generic/pgtable.h tools/consoled/io.c tools/consoled/xc_console.c xen/arch/x86/mm.c xen/arch/x86/smpboot.c xen/arch/x86/traps.c xen/include/xen/ac_timer.h xen/include/xen/sched.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Wed Aug 03 09:34:37 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Wed Aug 03 09:35:16 2005 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6  # Linux kernel version: 2.6.12-xen
     1.7 -# Thu Jul 14 21:55:53 2005
     1.8 +# Wed Aug  3 10:04:25 2005
     1.9  #
    1.10  CONFIG_XEN=y
    1.11  CONFIG_ARCH_XEN=y
    1.12 @@ -18,6 +18,8 @@ CONFIG_XEN_BLKDEV_GRANT=y
    1.13  CONFIG_XEN_NETDEV_BACKEND=y
    1.14  CONFIG_XEN_BLKDEV_FRONTEND=y
    1.15  CONFIG_XEN_NETDEV_FRONTEND=y
    1.16 +CONFIG_XEN_NETDEV_GRANT_TX=y
    1.17 +CONFIG_XEN_NETDEV_GRANT_RX=y
    1.18  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
    1.19  # CONFIG_XEN_BLKDEV_TAP is not set
    1.20  # CONFIG_XEN_SHADOW_MODE is not set