]>
Commit | Line | Data |
---|---|---|
062da07d DM |
1 | --- rh-kernel-src/kernel-3.10.0-x86_64.config 2014-04-23 09:14:23.000000000 +0200 |
2 | +++ config-3.10.0 2014-04-23 09:52:16.000000000 +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 | |
8 | +# Linux/x86 3.10.0-1-pve Kernel Configuration | |
9 | # | |
10 | CONFIG_64BIT=y | |
11 | CONFIG_X86_64=y | |
062da07d DM |
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 @@ | |
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 | |
062da07d | 41 | @@ -588,9 +578,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 | |
062da07d | 53 | @@ -1128,10 +1118,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 | |
062da07d | 66 | @@ -1139,7 +1129,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 | |
062da07d | 75 | @@ -1437,7 +1427,8 @@ |
9ed71929 DM |
76 | CONFIG_BLK_DEV_LOOP=m |
77 | CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 | |
78 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | |
79 | -# CONFIG_BLK_DEV_DRBD is not set | |
80 | +CONFIG_BLK_DEV_DRBD=m | |
81 | +# CONFIG_DRBD_FAULT_INJECTION is not set | |
82 | # CONFIG_BLK_DEV_NBD is not set | |
83 | CONFIG_BLK_DEV_NVME=m | |
84 | CONFIG_BLK_DEV_OSD=m | |
062da07d | 85 | @@ -1531,10 +1522,10 @@ |
688f31fc DM |
86 | # |
87 | # SCSI support type (disk, tape, CD-ROM) | |
88 | # | |
89 | -CONFIG_BLK_DEV_SD=m | |
90 | +CONFIG_BLK_DEV_SD=y | |
91 | CONFIG_CHR_DEV_ST=m | |
92 | CONFIG_CHR_DEV_OSST=m | |
93 | -CONFIG_BLK_DEV_SR=m | |
94 | +CONFIG_BLK_DEV_SR=y | |
95 | CONFIG_BLK_DEV_SR_VENDOR=y | |
96 | CONFIG_CHR_DEV_SG=m | |
97 | CONFIG_CHR_DEV_SCH=m | |
062da07d | 98 | @@ -1754,7 +1745,7 @@ |
688f31fc DM |
99 | CONFIG_MD_FAULTY=m |
100 | # CONFIG_BCACHE is not set | |
062da07d | 101 | CONFIG_BLK_DEV_DM_BUILTIN=y |
688f31fc DM |
102 | -CONFIG_BLK_DEV_DM=m |
103 | +CONFIG_BLK_DEV_DM=y | |
104 | CONFIG_DM_DEBUG=y | |
105 | CONFIG_DM_BUFIO=m | |
106 | CONFIG_DM_BIO_PRISON=m | |
062da07d | 107 | @@ -4542,7 +4533,11 @@ |
688f31fc DM |
108 | # CONFIG_JBD2_DEBUG is not set |
109 | CONFIG_FS_MBCACHE=m | |
110 | # CONFIG_REISERFS_FS is not set | |
111 | -# CONFIG_JFS_FS is not set | |
112 | +CONFIG_JFS_FS=m | |
113 | +# CONFIG_JFS_POSIX_ACL is not set | |
114 | +# CONFIG_JFS_SECURITY is not set | |
115 | +# CONFIG_JFS_DEBUG is not set | |
116 | +# CONFIG_JFS_STATISTICS is not set | |
117 | CONFIG_XFS_FS=m | |
118 | CONFIG_XFS_QUOTA=y | |
119 | CONFIG_XFS_POSIX_ACL=y | |
062da07d | 120 | @@ -4631,8 +4626,8 @@ |
688f31fc DM |
121 | # CONFIG_ADFS_FS is not set |
122 | # CONFIG_AFFS_FS is not set | |
123 | # CONFIG_ECRYPT_FS is not set | |
124 | -# CONFIG_HFS_FS is not set | |
125 | -# CONFIG_HFSPLUS_FS is not set | |
126 | +CONFIG_HFS_FS=y | |
127 | +CONFIG_HFSPLUS_FS=y | |
128 | # CONFIG_BEFS_FS is not set | |
129 | # CONFIG_BFS_FS is not set | |
130 | # CONFIG_EFS_FS is not set | |
062da07d | 131 | @@ -4769,7 +4764,7 @@ |
688f31fc DM |
132 | CONFIG_NLS_MAC_INUIT=m |
133 | CONFIG_NLS_MAC_ROMANIAN=m | |
134 | CONFIG_NLS_MAC_TURKISH=m | |
135 | -CONFIG_NLS_UTF8=m | |
136 | +CONFIG_NLS_UTF8=y | |
137 | CONFIG_DLM=m | |
138 | CONFIG_DLM_DEBUG=y | |
139 | ||
062da07d DM |
140 | @@ -4958,8 +4953,8 @@ |
141 | CONFIG_KEYS=y | |
142 | CONFIG_PERSISTENT_KEYRINGS=y | |
143 | CONFIG_BIG_KEYS=y | |
144 | -CONFIG_TRUSTED_KEYS=y | |
145 | -CONFIG_ENCRYPTED_KEYS=y | |
146 | +CONFIG_TRUSTED_KEYS=m | |
147 | +CONFIG_ENCRYPTED_KEYS=m | |
148 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | |
149 | # CONFIG_SECURITY_DMESG_RESTRICT is not set | |
150 | CONFIG_SECURITY=y | |
151 | @@ -4971,9 +4966,8 @@ | |
f396caf4 DM |
152 | CONFIG_INTEL_TXT=y |
153 | CONFIG_LSM_MMAP_MIN_ADDR=65535 | |
154 | CONFIG_SECURITY_SELINUX=y | |
155 | -CONFIG_SECURITY_SELINUX_BOOTPARAM=y | |
156 | -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | |
157 | -CONFIG_SECURITY_SELINUX_DISABLE=y | |
158 | +# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set | |
159 | +# CONFIG_SECURITY_SELINUX_DISABLE is not set | |
160 | CONFIG_SECURITY_SELINUX_DEVELOP=y | |
161 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | |
162 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | |
062da07d DM |
163 | @@ -4992,9 +4986,9 @@ |
164 | CONFIG_IMA_APPRAISE=y | |
165 | CONFIG_EVM=y | |
166 | CONFIG_EVM_HMAC_VERSION=2 | |
f396caf4 DM |
167 | -CONFIG_DEFAULT_SECURITY_SELINUX=y |
168 | -# CONFIG_DEFAULT_SECURITY_DAC is not set | |
169 | -CONFIG_DEFAULT_SECURITY="selinux" | |
170 | +# CONFIG_DEFAULT_SECURITY_SELINUX is not set | |
171 | +CONFIG_DEFAULT_SECURITY_DAC=y | |
172 | +CONFIG_DEFAULT_SECURITY="" | |
173 | CONFIG_XOR_BLOCKS=m | |
174 | CONFIG_ASYNC_CORE=m | |
175 | CONFIG_ASYNC_MEMCPY=m | |
062da07d | 176 | @@ -5066,7 +5060,7 @@ |
688f31fc DM |
177 | CONFIG_CRYPTO_CRC32C_INTEL=m |
178 | CONFIG_CRYPTO_CRC32=m | |
179 | CONFIG_CRYPTO_CRC32_PCLMUL=m | |
180 | -CONFIG_CRYPTO_CRCT10DIF=m | |
181 | +CONFIG_CRYPTO_CRCT10DIF=y | |
182 | CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m | |
183 | CONFIG_CRYPTO_GHASH=m | |
184 | CONFIG_CRYPTO_MD4=m | |
062da07d DM |
185 | @@ -5180,7 +5174,7 @@ |
186 | CONFIG_CMPXCHG_LOCKREF=y | |
688f31fc DM |
187 | CONFIG_CRC_CCITT=m |
188 | CONFIG_CRC16=y | |
189 | -CONFIG_CRC_T10DIF=m | |
190 | +CONFIG_CRC_T10DIF=y | |
191 | CONFIG_CRC_ITU_T=m | |
192 | CONFIG_CRC32=y | |
193 | # CONFIG_CRC32_SELFTEST is not set | |
062da07d | 194 | @@ -5227,6 +5221,7 @@ |
9ed71929 DM |
195 | CONFIG_DQL=y |
196 | CONFIG_NLATTR=y | |
197 | CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y | |
198 | +CONFIG_LRU_CACHE=m | |
199 | CONFIG_AVERAGE=y | |
200 | CONFIG_CLZ_TAB=y | |
201 | CONFIG_CORDIC=m |