ia64/xen-unstable

changeset 4093:41a2aa8951bc

bitkeeper revision 1.1159.258.47 (4230f31aZ2VYmMntbEMp_f1tNZA6WA)

Update to Linux 2.6.11.
Signed-off-by: Christian Limpach <chris@xensource.com>
author cl349@firebug.cl.cam.ac.uk
date Fri Mar 11 01:23:38 2005 +0000 (2005-03-11)
parents 60bb8d7ebc64
children 1b23a3ae5792
files linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Fri Mar 11 01:02:01 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Fri Mar 11 01:23:38 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.10-xen0
     1.7 -# Mon Feb 21 13:46:38 2005
     1.8 +# Linux kernel version: 2.6.11-xen0
     1.9 +# Fri Mar 11 01:02:42 2005
    1.10  #
    1.11  CONFIG_XEN=y
    1.12  CONFIG_ARCH_XEN=y
    1.13 @@ -13,12 +13,10 @@ CONFIG_NO_IDLE_HZ=y
    1.14  CONFIG_XEN_PRIVILEGED_GUEST=y
    1.15  CONFIG_XEN_PHYSDEV_ACCESS=y
    1.16  CONFIG_XEN_BLKDEV_BACKEND=y
    1.17 -# CONFIG_XEN_BLKDEV_TAP_BE is not set
    1.18  CONFIG_XEN_NETDEV_BACKEND=y
    1.19  CONFIG_XEN_BLKDEV_FRONTEND=y
    1.20  CONFIG_XEN_NETDEV_FRONTEND=y
    1.21  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
    1.22 -# CONFIG_XEN_BLKDEV_TAP is not set
    1.23  CONFIG_XEN_WRITABLE_PAGETABLES=y
    1.24  CONFIG_XEN_SCRUB_PAGES=y
    1.25  CONFIG_X86=y
    1.26 @@ -105,6 +103,7 @@ CONFIG_X86_CMPXCHG=y
    1.27  CONFIG_X86_XADD=y
    1.28  CONFIG_X86_L1_CACHE_SHIFT=7
    1.29  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
    1.30 +CONFIG_GENERIC_CALIBRATE_DELAY=y
    1.31  CONFIG_X86_WP_WORKS_OK=y
    1.32  CONFIG_X86_INVLPG=y
    1.33  CONFIG_X86_BSWAP=y
    1.34 @@ -116,6 +115,7 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
    1.35  # CONFIG_HPET_EMULATE_RTC is not set
    1.36  # CONFIG_SMP is not set
    1.37  CONFIG_PREEMPT=y
    1.38 +CONFIG_PREEMPT_BKL=y
    1.39  CONFIG_MICROCODE=y
    1.40  CONFIG_X86_CPUID=y
    1.41  
    1.42 @@ -212,6 +212,7 @@ CONFIG_BLK_CPQ_CISS_DA=y
    1.43  # CONFIG_CISS_SCSI_TAPE is not set
    1.44  # CONFIG_BLK_DEV_DAC960 is not set
    1.45  # CONFIG_BLK_DEV_UMEM is not set
    1.46 +# CONFIG_BLK_DEV_COW_COMMON is not set
    1.47  CONFIG_BLK_DEV_LOOP=y
    1.48  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
    1.49  # CONFIG_BLK_DEV_NBD is not set
    1.50 @@ -231,6 +232,7 @@ CONFIG_IOSCHED_NOOP=y
    1.51  CONFIG_IOSCHED_AS=y
    1.52  CONFIG_IOSCHED_DEADLINE=y
    1.53  CONFIG_IOSCHED_CFQ=y
    1.54 +# CONFIG_ATA_OVER_ETH is not set
    1.55  
    1.56  #
    1.57  # ATA/ATAPI/MFM/RLL support
    1.58 @@ -322,6 +324,7 @@ CONFIG_BLK_DEV_SD=y
    1.59  #
    1.60  # CONFIG_SCSI_SPI_ATTRS is not set
    1.61  # CONFIG_SCSI_FC_ATTRS is not set
    1.62 +# CONFIG_SCSI_ISCSI_ATTRS is not set
    1.63  
    1.64  #
    1.65  # SCSI low-level drivers
    1.66 @@ -358,6 +361,7 @@ CONFIG_SCSI_SATA=y
    1.67  CONFIG_SCSI_ATA_PIIX=y
    1.68  # CONFIG_SCSI_SATA_NV is not set
    1.69  CONFIG_SCSI_SATA_PROMISE=y
    1.70 +# CONFIG_SCSI_SATA_QSTOR is not set
    1.71  CONFIG_SCSI_SATA_SX4=y
    1.72  CONFIG_SCSI_SATA_SIL=y
    1.73  # CONFIG_SCSI_SATA_SIS is not set
    1.74 @@ -395,7 +399,6 @@ CONFIG_SCSI_QLA2XXX=y
    1.75  # CONFIG_SCSI_QLA2300 is not set
    1.76  # CONFIG_SCSI_QLA2322 is not set
    1.77  # CONFIG_SCSI_QLA6312 is not set
    1.78 -# CONFIG_SCSI_QLA6322 is not set
    1.79  # CONFIG_SCSI_SEAGATE is not set
    1.80  # CONFIG_SCSI_SYM53C416 is not set
    1.81  # CONFIG_SCSI_DC395x is not set
    1.82 @@ -533,14 +536,11 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
    1.83  # CONFIG_IP_NF_TARGET_REDIRECT is not set
    1.84  # CONFIG_IP_NF_TARGET_NETMAP is not set
    1.85  # CONFIG_IP_NF_TARGET_SAME is not set
    1.86 -# CONFIG_IP_NF_NAT_LOCAL is not set
    1.87  # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
    1.88  CONFIG_IP_NF_NAT_FTP=m
    1.89  # CONFIG_IP_NF_MANGLE is not set
    1.90  # CONFIG_IP_NF_RAW is not set
    1.91  # CONFIG_IP_NF_ARPTABLES is not set
    1.92 -# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
    1.93 -# CONFIG_IP_NF_COMPAT_IPFWADM is not set
    1.94  
    1.95  #
    1.96  # Bridge: Netfilter Configuration
    1.97 @@ -737,6 +737,7 @@ CONFIG_SERIO_I8042=y
    1.98  CONFIG_SERIO_SERPORT=y
    1.99  # CONFIG_SERIO_CT82C710 is not set
   1.100  # CONFIG_SERIO_PCIPS2 is not set
   1.101 +CONFIG_SERIO_LIBPS2=y
   1.102  # CONFIG_SERIO_RAW is not set
   1.103  
   1.104  #
   1.105 @@ -813,7 +814,7 @@ CONFIG_AGP_SIS=m
   1.106  CONFIG_AGP_SWORKS=m
   1.107  CONFIG_AGP_VIA=m
   1.108  # CONFIG_AGP_EFFICEON is not set
   1.109 -CONFIG_DRM=y
   1.110 +CONFIG_DRM=m
   1.111  CONFIG_DRM_TDFX=m
   1.112  # CONFIG_DRM_GAMMA is not set
   1.113  CONFIG_DRM_R128=m
   1.114 @@ -903,6 +904,10 @@ CONFIG_REISERFS_FS=y
   1.115  # CONFIG_REISERFS_PROC_INFO is not set
   1.116  # CONFIG_REISERFS_FS_XATTR is not set
   1.117  # CONFIG_JFS_FS is not set
   1.118 +
   1.119 +#
   1.120 +# XFS support
   1.121 +#
   1.122  # CONFIG_XFS_FS is not set
   1.123  # CONFIG_MINIX_FS is not set
   1.124  # CONFIG_ROMFS_FS is not set
   1.125 @@ -1070,6 +1075,11 @@ CONFIG_CRYPTO_CRC32C=m
   1.126  # CONFIG_CRYPTO_TEST is not set
   1.127  
   1.128  #
   1.129 +# Hardware crypto devices
   1.130 +#
   1.131 +# CONFIG_CRYPTO_DEV_PADLOCK is not set
   1.132 +
   1.133 +#
   1.134  # Library routines
   1.135  #
   1.136  # CONFIG_CRC_CCITT is not set
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig	Fri Mar 11 01:02:01 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig	Fri Mar 11 01:23:38 2005 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6 -# Linux kernel version: 2.6.10-rc3-xenU
     2.7 -# Sun Dec 26 10:35:15 2004
     2.8 +# Linux kernel version: 2.6.11-xenU
     2.9 +# Fri Mar 11 01:20:28 2005
    2.10  #
    2.11  CONFIG_XEN=y
    2.12  CONFIG_ARCH_XEN=y
    2.13 @@ -12,16 +12,14 @@ CONFIG_NO_IDLE_HZ=y
    2.14  #
    2.15  # CONFIG_XEN_PRIVILEGED_GUEST is not set
    2.16  # CONFIG_XEN_PHYSDEV_ACCESS is not set
    2.17 -# CONFIG_XEN_BLKDEV_BACKEND is not set
    2.18 -# CONFIG_XEN_NETDEV_BACKEND is not set
    2.19  CONFIG_XEN_BLKDEV_FRONTEND=y
    2.20  CONFIG_XEN_NETDEV_FRONTEND=y
    2.21  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
    2.22  CONFIG_XEN_WRITABLE_PAGETABLES=y
    2.23  CONFIG_XEN_SCRUB_PAGES=y
    2.24 -CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
    2.25  CONFIG_X86=y
    2.26  # CONFIG_X86_64 is not set
    2.27 +CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
    2.28  
    2.29  #
    2.30  # Code maturity level options
    2.31 @@ -47,7 +45,6 @@ CONFIG_KOBJECT_UEVENT=y
    2.32  # CONFIG_IKCONFIG is not set
    2.33  # CONFIG_EMBEDDED is not set
    2.34  CONFIG_KALLSYMS=y
    2.35 -# CONFIG_KALLSYMS_ALL is not set
    2.36  # CONFIG_KALLSYMS_EXTRA_PASS is not set
    2.37  CONFIG_FUTEX=y
    2.38  CONFIG_EPOLL=y
    2.39 @@ -103,6 +100,7 @@ CONFIG_X86_CMPXCHG=y
    2.40  CONFIG_X86_XADD=y
    2.41  CONFIG_X86_L1_CACHE_SHIFT=7
    2.42  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
    2.43 +CONFIG_GENERIC_CALIBRATE_DELAY=y
    2.44  CONFIG_X86_WP_WORKS_OK=y
    2.45  CONFIG_X86_INVLPG=y
    2.46  CONFIG_X86_BSWAP=y
    2.47 @@ -114,6 +112,7 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
    2.48  # CONFIG_HPET_EMULATE_RTC is not set
    2.49  # CONFIG_SMP is not set
    2.50  CONFIG_PREEMPT=y
    2.51 +CONFIG_PREEMPT_BKL=y
    2.52  CONFIG_X86_CPUID=y
    2.53  
    2.54  #
    2.55 @@ -155,12 +154,12 @@ CONFIG_BINFMT_ELF=y
    2.56  CONFIG_STANDALONE=y
    2.57  CONFIG_PREVENT_FIRMWARE_BUILD=y
    2.58  # CONFIG_FW_LOADER is not set
    2.59 -# CONFIG_DEBUG_DRIVER is not set
    2.60  
    2.61  #
    2.62  # Block devices
    2.63  #
    2.64  # CONFIG_BLK_DEV_FD is not set
    2.65 +# CONFIG_BLK_DEV_COW_COMMON is not set
    2.66  CONFIG_BLK_DEV_LOOP=m
    2.67  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
    2.68  CONFIG_BLK_DEV_NBD=m
    2.69 @@ -179,6 +178,7 @@ CONFIG_IOSCHED_NOOP=y
    2.70  CONFIG_IOSCHED_AS=y
    2.71  CONFIG_IOSCHED_DEADLINE=y
    2.72  CONFIG_IOSCHED_CFQ=y
    2.73 +# CONFIG_ATA_OVER_ETH is not set
    2.74  
    2.75  #
    2.76  # SCSI device support
    2.77 @@ -207,6 +207,7 @@ CONFIG_BLK_DEV_SD=m
    2.78  #
    2.79  # CONFIG_SCSI_SPI_ATTRS is not set
    2.80  # CONFIG_SCSI_FC_ATTRS is not set
    2.81 +# CONFIG_SCSI_ISCSI_ATTRS is not set
    2.82  
    2.83  #
    2.84  # SCSI low-level drivers
    2.85 @@ -339,6 +340,10 @@ CONFIG_REISERFS_FS=y
    2.86  # CONFIG_REISERFS_PROC_INFO is not set
    2.87  # CONFIG_REISERFS_FS_XATTR is not set
    2.88  # CONFIG_JFS_FS is not set
    2.89 +
    2.90 +#
    2.91 +# XFS support
    2.92 +#
    2.93  # CONFIG_XFS_FS is not set
    2.94  # CONFIG_MINIX_FS is not set
    2.95  # CONFIG_ROMFS_FS is not set
    2.96 @@ -409,7 +414,6 @@ CONFIG_NFS_V3=y
    2.97  CONFIG_ROOT_NFS=y
    2.98  CONFIG_LOCKD=y
    2.99  CONFIG_LOCKD_V4=y
   2.100 -# CONFIG_EXPORTFS is not set
   2.101  CONFIG_SUNRPC=y
   2.102  # CONFIG_RPCSEC_GSS_KRB5 is not set
   2.103  # CONFIG_RPCSEC_GSS_SPKM3 is not set
   2.104 @@ -504,6 +508,11 @@ CONFIG_CRYPTO_CRC32C=m
   2.105  # CONFIG_CRYPTO_TEST is not set
   2.106  
   2.107  #
   2.108 +# Hardware crypto devices
   2.109 +#
   2.110 +# CONFIG_CRYPTO_DEV_PADLOCK is not set
   2.111 +
   2.112 +#
   2.113  # Library routines
   2.114  #
   2.115  # CONFIG_CRC_CCITT is not set