]>
Commit | Line | Data |
---|---|---|
c3701be9 DM |
1 | --- rh-kernel-src/kernel-3.10.0-x86_64.config 2015-04-05 18:12:54.643110125 +0200 |
2 | +++ linux-2.6-3.10.0/.config 2015-04-05 18:13:09.244970726 +0200 | |
688f31fc DM |
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 | |
d20083ac | 8 | +# Linux/x86 3.10.0-8-pve Kernel Configuration |
688f31fc DM |
9 | # |
10 | CONFIG_64BIT=y | |
11 | CONFIG_X86_64=y | |
d20083ac | 12 | @@ -264,8 +263,8 @@ |
062da07d DM |
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 | |
d20083ac | 23 | @@ -289,16 +288,7 @@ |
688f31fc DM |
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 | |
d20083ac | 41 | @@ -595,9 +585,9 @@ |
db697728 DM |
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 | |
d20083ac | 53 | @@ -1146,10 +1136,10 @@ |
688f31fc DM |
54 | CONFIG_L2TP_V3=y |
55 | CONFIG_L2TP_IP=m | |
56 | CONFIG_L2TP_ETH=m | |
57 | -CONFIG_STP=m | |
58 | +CONFIG_STP=y | |
e857e197 DM |
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 | |
d20083ac | 66 | @@ -1157,7 +1147,7 @@ |
688f31fc DM |
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 | |
d20083ac | 75 | @@ -1456,10 +1446,11 @@ |
2600940a DM |
76 | # CONFIG_BLK_DEV_UMEM is not set |
77 | # CONFIG_BLK_DEV_COW_COMMON is not set | |
9ed71929 | 78 | CONFIG_BLK_DEV_LOOP=m |
2600940a DM |
79 | -CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 |
80 | +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 | |
9ed71929 DM |
81 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
82 | -# CONFIG_BLK_DEV_DRBD is not set | |
2600940a | 83 | -# CONFIG_BLK_DEV_NBD is not set |
9ed71929 DM |
84 | +CONFIG_BLK_DEV_DRBD=m |
85 | +# CONFIG_DRBD_FAULT_INJECTION is not set | |
2600940a | 86 | +CONFIG_BLK_DEV_NBD=m |
9ed71929 DM |
87 | CONFIG_BLK_DEV_NVME=m |
88 | CONFIG_BLK_DEV_OSD=m | |
2600940a | 89 | CONFIG_BLK_DEV_SX8=m |
d20083ac | 90 | @@ -1554,10 +1545,10 @@ |
688f31fc DM |
91 | # |
92 | # SCSI support type (disk, tape, CD-ROM) | |
93 | # | |
94 | -CONFIG_BLK_DEV_SD=m | |
95 | +CONFIG_BLK_DEV_SD=y | |
96 | CONFIG_CHR_DEV_ST=m | |
97 | CONFIG_CHR_DEV_OSST=m | |
98 | -CONFIG_BLK_DEV_SR=m | |
99 | +CONFIG_BLK_DEV_SR=y | |
100 | CONFIG_BLK_DEV_SR_VENDOR=y | |
101 | CONFIG_CHR_DEV_SG=m | |
102 | CONFIG_CHR_DEV_SCH=m | |
d20083ac | 103 | @@ -1775,9 +1766,12 @@ |
bfcb7405 DM |
104 | CONFIG_MD_RAID456=m |
105 | # CONFIG_MD_MULTIPATH is not set | |
688f31fc | 106 | CONFIG_MD_FAULTY=m |
bfcb7405 DM |
107 | -# CONFIG_BCACHE is not set |
108 | +CONFIG_BCACHE=m | |
e9284e57 DM |
109 | +# CONFIG_BCACHE_DEBUG is not set |
110 | +# CONFIG_BCACHE_EDEBUG is not set | |
111 | +# CONFIG_BCACHE_CLOSURES_DEBUG is not set | |
062da07d | 112 | CONFIG_BLK_DEV_DM_BUILTIN=y |
688f31fc DM |
113 | -CONFIG_BLK_DEV_DM=m |
114 | +CONFIG_BLK_DEV_DM=y | |
115 | CONFIG_DM_DEBUG=y | |
116 | CONFIG_DM_BUFIO=m | |
117 | CONFIG_DM_BIO_PRISON=m | |
d20083ac | 118 | @@ -1863,7 +1857,7 @@ |
5345f59d AD |
119 | # CAIF transport drivers |
120 | # | |
121 | CONFIG_VHOST_NET=m | |
122 | -# CONFIG_VHOST_SCSI is not set | |
123 | +CONFIG_VHOST_SCSI=m | |
124 | CONFIG_VHOST_RING=m | |
125 | ||
126 | # | |
d20083ac DM |
127 | @@ -1970,7 +1964,8 @@ |
128 | CONFIG_MYRI10GE_DCA=y | |
129 | # CONFIG_FEALNX is not set | |
130 | # CONFIG_NET_VENDOR_NATSEMI is not set | |
131 | -# CONFIG_NET_VENDOR_NVIDIA is not set | |
132 | +CONFIG_NET_VENDOR_NVIDIA=y | |
133 | +CONFIG_FORCEDETH=m | |
134 | CONFIG_NET_VENDOR_OKI=y | |
135 | CONFIG_PCH_GBE=m | |
136 | CONFIG_ETHOC=m | |
137 | @@ -4377,7 +4372,7 @@ | |
33739cab AD |
138 | CONFIG_VFIO_IOMMU_TYPE1=m |
139 | CONFIG_VFIO=m | |
140 | CONFIG_VFIO_PCI=m | |
141 | -# CONFIG_VFIO_PCI_VGA is not set | |
142 | +CONFIG_VFIO_PCI_VGA=y | |
143 | # CONFIG_VIRT_DRIVERS is not set | |
144 | CONFIG_VIRTIO=m | |
145 | ||
d20083ac | 146 | @@ -4596,7 +4591,11 @@ |
688f31fc DM |
147 | # CONFIG_JBD2_DEBUG is not set |
148 | CONFIG_FS_MBCACHE=m | |
149 | # CONFIG_REISERFS_FS is not set | |
150 | -# CONFIG_JFS_FS is not set | |
151 | +CONFIG_JFS_FS=m | |
152 | +# CONFIG_JFS_POSIX_ACL is not set | |
153 | +# CONFIG_JFS_SECURITY is not set | |
154 | +# CONFIG_JFS_DEBUG is not set | |
155 | +# CONFIG_JFS_STATISTICS is not set | |
156 | CONFIG_XFS_FS=m | |
157 | CONFIG_XFS_QUOTA=y | |
158 | CONFIG_XFS_POSIX_ACL=y | |
d20083ac | 159 | @@ -4686,8 +4685,8 @@ |
688f31fc DM |
160 | # CONFIG_ADFS_FS is not set |
161 | # CONFIG_AFFS_FS is not set | |
162 | # CONFIG_ECRYPT_FS is not set | |
163 | -# CONFIG_HFS_FS is not set | |
164 | -# CONFIG_HFSPLUS_FS is not set | |
165 | +CONFIG_HFS_FS=y | |
166 | +CONFIG_HFSPLUS_FS=y | |
167 | # CONFIG_BEFS_FS is not set | |
168 | # CONFIG_BFS_FS is not set | |
169 | # CONFIG_EFS_FS is not set | |
d20083ac | 170 | @@ -4824,7 +4823,7 @@ |
688f31fc DM |
171 | CONFIG_NLS_MAC_INUIT=m |
172 | CONFIG_NLS_MAC_ROMANIAN=m | |
173 | CONFIG_NLS_MAC_TURKISH=m | |
174 | -CONFIG_NLS_UTF8=m | |
175 | +CONFIG_NLS_UTF8=y | |
176 | CONFIG_DLM=m | |
177 | CONFIG_DLM_DEBUG=y | |
178 | ||
c3701be9 | 179 | @@ -5017,29 +5016,30 @@ |
062da07d DM |
180 | CONFIG_KEYS=y |
181 | CONFIG_PERSISTENT_KEYRINGS=y | |
182 | CONFIG_BIG_KEYS=y | |
183 | -CONFIG_TRUSTED_KEYS=y | |
184 | -CONFIG_ENCRYPTED_KEYS=y | |
185 | +CONFIG_TRUSTED_KEYS=m | |
186 | +CONFIG_ENCRYPTED_KEYS=m | |
187 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | |
188 | # CONFIG_SECURITY_DMESG_RESTRICT is not set | |
189 | CONFIG_SECURITY=y | |
37e96ed9 DM |
190 | CONFIG_SECURITYFS=y |
191 | CONFIG_SECURITY_NETWORK=y | |
192 | CONFIG_SECURITY_NETWORK_XFRM=y | |
193 | -# CONFIG_SECURITY_PATH is not set | |
194 | +CONFIG_SECURITY_PATH=y | |
195 | CONFIG_SECURITY_SECURELEVEL=y | |
f396caf4 DM |
196 | CONFIG_INTEL_TXT=y |
197 | CONFIG_LSM_MMAP_MIN_ADDR=65535 | |
198 | CONFIG_SECURITY_SELINUX=y | |
199 | -CONFIG_SECURITY_SELINUX_BOOTPARAM=y | |
200 | -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | |
201 | -CONFIG_SECURITY_SELINUX_DISABLE=y | |
202 | +# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set | |
203 | +# CONFIG_SECURITY_SELINUX_DISABLE is not set | |
204 | CONFIG_SECURITY_SELINUX_DEVELOP=y | |
205 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | |
206 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | |
37e96ed9 DM |
207 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set |
208 | # CONFIG_SECURITY_SMACK is not set | |
209 | # CONFIG_SECURITY_TOMOYO is not set | |
210 | -# CONFIG_SECURITY_APPARMOR is not set | |
211 | +CONFIG_SECURITY_APPARMOR=y | |
212 | +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 | |
c3701be9 | 213 | +CONFIG_SECURITY_APPARMOR_COMPAT_24=y |
37e96ed9 DM |
214 | # CONFIG_SECURITY_YAMA is not set |
215 | CONFIG_INTEGRITY=y | |
216 | CONFIG_INTEGRITY_SIGNATURE=y | |
c3701be9 | 217 | @@ -5050,11 +5050,10 @@ |
37e96ed9 DM |
218 | CONFIG_IMA_LSM_RULES=y |
219 | CONFIG_IMA_APPRAISE=y | |
220 | CONFIG_IMA_TRUSTED_KEYRING=y | |
221 | -CONFIG_EVM=y | |
222 | -CONFIG_EVM_HMAC_VERSION=2 | |
223 | -CONFIG_DEFAULT_SECURITY_SELINUX=y | |
224 | +# CONFIG_DEFAULT_SECURITY_SELINUX is not set | |
225 | +CONFIG_DEFAULT_SECURITY_APPARMOR=y | |
226 | # CONFIG_DEFAULT_SECURITY_DAC is not set | |
f396caf4 | 227 | -CONFIG_DEFAULT_SECURITY="selinux" |
37e96ed9 | 228 | +CONFIG_DEFAULT_SECURITY="apparmor" |
f396caf4 DM |
229 | CONFIG_XOR_BLOCKS=m |
230 | CONFIG_ASYNC_CORE=m | |
231 | CONFIG_ASYNC_MEMCPY=m | |
c3701be9 | 232 | @@ -5066,7 +5065,6 @@ |
37e96ed9 DM |
233 | # |
234 | # Crypto core or helper | |
235 | # | |
236 | -CONFIG_CRYPTO_FIPS=y | |
237 | CONFIG_CRYPTO_ALGAPI=y | |
238 | CONFIG_CRYPTO_ALGAPI2=y | |
239 | CONFIG_CRYPTO_AEAD=y | |
c3701be9 | 240 | @@ -5126,7 +5124,7 @@ |
688f31fc DM |
241 | CONFIG_CRYPTO_CRC32C_INTEL=m |
242 | CONFIG_CRYPTO_CRC32=m | |
243 | CONFIG_CRYPTO_CRC32_PCLMUL=m | |
244 | -CONFIG_CRYPTO_CRCT10DIF=m | |
245 | +CONFIG_CRYPTO_CRCT10DIF=y | |
246 | CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m | |
247 | CONFIG_CRYPTO_GHASH=m | |
248 | CONFIG_CRYPTO_MD4=m | |
c3701be9 | 249 | @@ -5252,7 +5250,7 @@ |
062da07d | 250 | CONFIG_CMPXCHG_LOCKREF=y |
688f31fc DM |
251 | CONFIG_CRC_CCITT=m |
252 | CONFIG_CRC16=y | |
253 | -CONFIG_CRC_T10DIF=m | |
254 | +CONFIG_CRC_T10DIF=y | |
255 | CONFIG_CRC_ITU_T=m | |
256 | CONFIG_CRC32=y | |
257 | # CONFIG_CRC32_SELFTEST is not set | |
c3701be9 | 258 | @@ -5301,6 +5299,7 @@ |
9ed71929 DM |
259 | CONFIG_DQL=y |
260 | CONFIG_NLATTR=y | |
261 | CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y | |
262 | +CONFIG_LRU_CACHE=m | |
263 | CONFIG_AVERAGE=y | |
264 | CONFIG_CLZ_TAB=y | |
265 | CONFIG_CORDIC=m |