config-3.10.0.diff

   1 --- rh-kernel-src/kernel-3.10.0-x86_64.config   2014-06-13 09:32:05.616074844 +0200
   2 +++ linux-2.6-3.10.0/.config    2014-06-22 15:01:45.753338384 +0200
   3 @@ -1,7 +1,6 @@
   4 -# x86_64
   5  #
   6  # Automatically generated file; DO NOT EDIT.
   7 -# Linux/x86_64 3.10.0 Kernel Configuration
   8 +# Linux/x86 3.10.0-2-pve Kernel Configuration
   9  #
  10  CONFIG_64BIT=y
  11  CONFIG_X86_64=y
  12 @@ -262,8 +261,8 @@
  13  CONFIG_HAVE_CC_STACKPROTECTOR=y
  14  CONFIG_CC_STACKPROTECTOR=y
  15  # CONFIG_CC_STACKPROTECTOR_NONE is not set
  16 -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
  17 -CONFIG_CC_STACKPROTECTOR_STRONG=y
  18 +CONFIG_CC_STACKPROTECTOR_REGULAR=y
  19 +# CONFIG_CC_STACKPROTECTOR_STRONG is not set
  20  CONFIG_HAVE_CONTEXT_TRACKING=y
  21  CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
  22  CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
  23 @@ -287,16 +286,7 @@
  24  # CONFIG_MODULE_FORCE_UNLOAD is not set
  25  CONFIG_MODVERSIONS=y
  26  CONFIG_MODULE_SRCVERSION_ALL=y
  27 -CONFIG_MODULE_SIG=y
  28 -# CONFIG_MODULE_SIG_FORCE is not set
  29 -CONFIG_MODULE_SIG_ALL=y
  30 -CONFIG_MODULE_SIG_UEFI=y
  31 -# CONFIG_MODULE_SIG_SHA1 is not set
  32 -# CONFIG_MODULE_SIG_SHA224 is not set
  33 -CONFIG_MODULE_SIG_SHA256=y
  34 -# CONFIG_MODULE_SIG_SHA384 is not set
  35 -# CONFIG_MODULE_SIG_SHA512 is not set
  36 -CONFIG_MODULE_SIG_HASH="sha256"
  37 +# CONFIG_MODULE_SIG is not set
  38  CONFIG_STOP_MACHINE=y
  39  CONFIG_BLOCK=y
  40  CONFIG_BLK_DEV_BSG=y
  41 @@ -588,9 +578,9 @@
  42  CONFIG_CPU_FREQ_GOV_COMMON=y
  43  CONFIG_CPU_FREQ_STAT=m
  44  CONFIG_CPU_FREQ_STAT_DETAILS=y
  45 -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
  46 +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
  47  # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
  48 -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  49 +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
  50  # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
  51  CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
  52  CONFIG_CPU_FREQ_GOV_POWERSAVE=y
  53 @@ -1128,10 +1118,10 @@
  54  CONFIG_L2TP_V3=y
  55  CONFIG_L2TP_IP=m
  56  CONFIG_L2TP_ETH=m
  57 -CONFIG_STP=m
  58 +CONFIG_STP=y
  59  CONFIG_GARP=m
  60  CONFIG_MRP=m
  61 -CONFIG_BRIDGE=m
  62 +CONFIG_BRIDGE=y
  63  CONFIG_BRIDGE_IGMP_SNOOPING=y
  64  CONFIG_BRIDGE_VLAN_FILTERING=y
  65  CONFIG_HAVE_NET_DSA=y
  66 @@ -1139,7 +1129,7 @@
  67  CONFIG_VLAN_8021Q_GVRP=y
  68  CONFIG_VLAN_8021Q_MVRP=y
  69  # CONFIG_DECNET is not set
  70 -CONFIG_LLC=m
  71 +CONFIG_LLC=y
  72  # CONFIG_LLC2 is not set
  73  # CONFIG_IPX is not set
  74  # CONFIG_ATALK is not set
  75 @@ -1302,7 +1292,9 @@
  76  CONFIG_RFKILL_INPUT=y
  77  # CONFIG_NET_9P is not set
  78  # CONFIG_CAIF is not set
  79 -# CONFIG_CEPH_LIB is not set
  80 +CONFIG_CEPH_LIB=m
  81 +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
  82 +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
  83  # CONFIG_NFC is not set
  84  CONFIG_HAVE_BPF_JIT=y
  85
  86 @@ -1435,10 +1427,11 @@
  87  # CONFIG_BLK_DEV_UMEM is not set
  88  # CONFIG_BLK_DEV_COW_COMMON is not set
  89  CONFIG_BLK_DEV_LOOP=m
  90 -CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
  91 +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
  92  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
  93 -# CONFIG_BLK_DEV_DRBD is not set
  94 -# CONFIG_BLK_DEV_NBD is not set
  95 +CONFIG_BLK_DEV_DRBD=m
  96 +# CONFIG_DRBD_FAULT_INJECTION is not set
  97 +CONFIG_BLK_DEV_NBD=m
  98  CONFIG_BLK_DEV_NVME=m
  99  CONFIG_BLK_DEV_OSD=m
 100  CONFIG_BLK_DEV_SX8=m
 101 @@ -1453,7 +1446,7 @@
 102  CONFIG_XEN_BLKDEV_FRONTEND=m
 103  CONFIG_VIRTIO_BLK=m
 104  # CONFIG_BLK_DEV_HD is not set
 105 -# CONFIG_BLK_DEV_RBD is not set
 106 +CONFIG_BLK_DEV_RBD=m
 107  # CONFIG_BLK_DEV_RSXX is not set
 108
 109  #
 110 @@ -1531,10 +1524,10 @@
 111  #
 112  # SCSI support type (disk, tape, CD-ROM)
 113  #
 114 -CONFIG_BLK_DEV_SD=m
 115 +CONFIG_BLK_DEV_SD=y
 116  CONFIG_CHR_DEV_ST=m
 117  CONFIG_CHR_DEV_OSST=m
 118 -CONFIG_BLK_DEV_SR=m
 119 +CONFIG_BLK_DEV_SR=y
 120  CONFIG_BLK_DEV_SR_VENDOR=y
 121  CONFIG_CHR_DEV_SG=m
 122  CONFIG_CHR_DEV_SCH=m
 123 @@ -1752,9 +1745,12 @@
 124  CONFIG_MD_RAID456=m
 125  # CONFIG_MD_MULTIPATH is not set
 126  CONFIG_MD_FAULTY=m
 127 -# CONFIG_BCACHE is not set
 128 +CONFIG_BCACHE=m
 129 +# CONFIG_BCACHE_DEBUG is not set
 130 +# CONFIG_BCACHE_EDEBUG is not set
 131 +# CONFIG_BCACHE_CLOSURES_DEBUG is not set
 132  CONFIG_BLK_DEV_DM_BUILTIN=y
 133 -CONFIG_BLK_DEV_DM=m
 134 +CONFIG_BLK_DEV_DM=y
 135  CONFIG_DM_DEBUG=y
 136  CONFIG_DM_BUFIO=m
 137  CONFIG_DM_BIO_PRISON=m
 138 @@ -4326,7 +4322,7 @@
 139  CONFIG_VFIO_IOMMU_TYPE1=m
 140  CONFIG_VFIO=m
 141  CONFIG_VFIO_PCI=m
 142 -# CONFIG_VFIO_PCI_VGA is not set
 143 +CONFIG_VFIO_PCI_VGA=y
 144  # CONFIG_VIRT_DRIVERS is not set
 145  CONFIG_VIRTIO=m
 146
 147 @@ -4542,7 +4538,11 @@
 148  # CONFIG_JBD2_DEBUG is not set
 149  CONFIG_FS_MBCACHE=m
 150  # CONFIG_REISERFS_FS is not set
 151 -# CONFIG_JFS_FS is not set
 152 +CONFIG_JFS_FS=m
 153 +# CONFIG_JFS_POSIX_ACL is not set
 154 +# CONFIG_JFS_SECURITY is not set
 155 +# CONFIG_JFS_DEBUG is not set
 156 +# CONFIG_JFS_STATISTICS is not set
 157  CONFIG_XFS_FS=m
 158  CONFIG_XFS_QUOTA=y
 159  CONFIG_XFS_POSIX_ACL=y
 160 @@ -4631,8 +4631,8 @@
 161  # CONFIG_ADFS_FS is not set
 162  # CONFIG_AFFS_FS is not set
 163  # CONFIG_ECRYPT_FS is not set
 164 -# CONFIG_HFS_FS is not set
 165 -# CONFIG_HFSPLUS_FS is not set
 166 +CONFIG_HFS_FS=y
 167 +CONFIG_HFSPLUS_FS=y
 168  # CONFIG_BEFS_FS is not set
 169  # CONFIG_BFS_FS is not set
 170  # CONFIG_EFS_FS is not set
 171 @@ -4769,7 +4769,7 @@
 172  CONFIG_NLS_MAC_INUIT=m
 173  CONFIG_NLS_MAC_ROMANIAN=m
 174  CONFIG_NLS_MAC_TURKISH=m
 175 -CONFIG_NLS_UTF8=m
 176 +CONFIG_NLS_UTF8=y
 177  CONFIG_DLM=m
 178  CONFIG_DLM_DEBUG=y
 179
 180 @@ -4958,8 +4958,8 @@
 181  CONFIG_KEYS=y
 182  CONFIG_PERSISTENT_KEYRINGS=y
 183  CONFIG_BIG_KEYS=y
 184 -CONFIG_TRUSTED_KEYS=y
 185 -CONFIG_ENCRYPTED_KEYS=y
 186 +CONFIG_TRUSTED_KEYS=m
 187 +CONFIG_ENCRYPTED_KEYS=m
 188  CONFIG_KEYS_DEBUG_PROC_KEYS=y
 189  # CONFIG_SECURITY_DMESG_RESTRICT is not set
 190  CONFIG_SECURITY=y
 191 @@ -4971,9 +4971,8 @@
 192  CONFIG_INTEL_TXT=y
 193  CONFIG_LSM_MMAP_MIN_ADDR=65535
 194  CONFIG_SECURITY_SELINUX=y
 195 -CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 196 -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 197 -CONFIG_SECURITY_SELINUX_DISABLE=y
 198 +# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
 199 +# CONFIG_SECURITY_SELINUX_DISABLE is not set
 200  CONFIG_SECURITY_SELINUX_DEVELOP=y
 201  CONFIG_SECURITY_SELINUX_AVC_STATS=y
 202  CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 203 @@ -4990,11 +4989,9 @@
 204  CONFIG_IMA_AUDIT=y
 205  CONFIG_IMA_LSM_RULES=y
 206  CONFIG_IMA_APPRAISE=y
 207 -CONFIG_EVM=y
 208 -CONFIG_EVM_HMAC_VERSION=2
 209 -CONFIG_DEFAULT_SECURITY_SELINUX=y
 210 -# CONFIG_DEFAULT_SECURITY_DAC is not set
 211 -CONFIG_DEFAULT_SECURITY="selinux"
 212 +# CONFIG_DEFAULT_SECURITY_SELINUX is not set
 213 +CONFIG_DEFAULT_SECURITY_DAC=y
 214 +CONFIG_DEFAULT_SECURITY=""
 215  CONFIG_XOR_BLOCKS=m
 216  CONFIG_ASYNC_CORE=m
 217  CONFIG_ASYNC_MEMCPY=m
 218 @@ -5066,7 +5063,7 @@
 219  CONFIG_CRYPTO_CRC32C_INTEL=m
 220  CONFIG_CRYPTO_CRC32=m
 221  CONFIG_CRYPTO_CRC32_PCLMUL=m
 222 -CONFIG_CRYPTO_CRCT10DIF=m
 223 +CONFIG_CRYPTO_CRCT10DIF=y
 224  CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 225  CONFIG_CRYPTO_GHASH=m
 226  CONFIG_CRYPTO_MD4=m
 227 @@ -5180,7 +5177,7 @@
 228  CONFIG_CMPXCHG_LOCKREF=y
 229  CONFIG_CRC_CCITT=m
 230  CONFIG_CRC16=y
 231 -CONFIG_CRC_T10DIF=m
 232 +CONFIG_CRC_T10DIF=y
 233  CONFIG_CRC_ITU_T=m
 234  CONFIG_CRC32=y
 235  # CONFIG_CRC32_SELFTEST is not set
 236 @@ -5227,6 +5224,7 @@
 237  CONFIG_DQL=y
 238  CONFIG_NLATTR=y
 239  CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 240 +CONFIG_LRU_CACHE=m
 241  CONFIG_AVERAGE=y
 242  CONFIG_CLZ_TAB=y
 243  CONFIG_CORDIC=m