ia64/xen-unstable

changeset 6016:63995acdd34a

find changesets by author, revision, files, or words in the commit message
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
     3.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Wed Aug 03 09:34:37 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen_defconfig_x86_32	Wed Aug 03 09:35:16 2005 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  #
     3.5  # Automatically generated make config: don't edit
     3.6  # Linux kernel version: 2.6.12-xen
     3.7 -# Thu Jul 14 21:55:53 2005
     3.8 +# Wed Aug  3 10:04:25 2005
     3.9  #
    3.10  CONFIG_XEN=y
    3.11  CONFIG_ARCH_XEN=y
    3.12 @@ -18,6 +18,8 @@ CONFIG_XEN_BLKDEV_GRANT=y
    3.13  CONFIG_XEN_NETDEV_BACKEND=y
    3.14  CONFIG_XEN_BLKDEV_FRONTEND=y
    3.15  CONFIG_XEN_NETDEV_FRONTEND=y
    3.16 +CONFIG_XEN_NETDEV_GRANT_TX=y
    3.17 +CONFIG_XEN_NETDEV_GRANT_RX=y
    3.18  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
    3.19  # CONFIG_XEN_BLKDEV_TAP is not set
    3.20  # CONFIG_XEN_SHADOW_MODE is not set