ia64/xen-unstable
changeset 5954:a75db157d12f
Revert unintended enabling of grant tables for netback/netfront
author | smh22@firebug.cl.cam.ac.uk |
---|---|
date | Tue Aug 02 09:26:30 2005 +0000 (2005-08-02) |
parents | 975c937c33f9 |
children | 706733e1ecdf 76794dad0aaf |
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 |
line diff
1.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 Mon Aug 01 16:00:17 2005 +0000 1.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 Tue Aug 02 09:26:30 2005 +0000 1.3 @@ -18,8 +18,8 @@ CONFIG_XEN_BLKDEV_GRANT=y 1.4 CONFIG_XEN_NETDEV_BACKEND=y 1.5 CONFIG_XEN_BLKDEV_FRONTEND=y 1.6 CONFIG_XEN_NETDEV_FRONTEND=y 1.7 -CONFIG_XEN_NETDEV_GRANT_TX=y 1.8 - CONFIG_XEN_NETDEV_GRANT_RX=y 1.9 +#CONFIG_XEN_NETDEV_GRANT_TX=y 1.10 +#CONFIG_XEN_NETDEV_GRANT_RX=y 1.11 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set 1.12 # CONFIG_XEN_BLKDEV_TAP is not set 1.13 # CONFIG_XEN_SHADOW_MODE is not set
2.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 Mon Aug 01 16:00:17 2005 +0000 2.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 Tue Aug 02 09:26:30 2005 +0000 2.3 @@ -15,8 +15,8 @@ CONFIG_NO_IDLE_HZ=y 2.4 CONFIG_XEN_BLKDEV_GRANT=y 2.5 CONFIG_XEN_BLKDEV_FRONTEND=y 2.6 CONFIG_XEN_NETDEV_FRONTEND=y 2.7 -CONFIG_XEN_NETDEV_GRANT_TX=y 2.8 -CONFIG_XEN_NETDEV_GRANT_RX=y 2.9 +#CONFIG_XEN_NETDEV_GRANT_TX=y 2.10 +#CONFIG_XEN_NETDEV_GRANT_RX=y 2.11 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set 2.12 # CONFIG_XEN_BLKDEV_TAP is not set 2.13 # CONFIG_XEN_SHADOW_MODE is not set