]> git.proxmox.com Git - pve-kernel-3.10.0.git/blame - config-3.10.0.diff
enable BCACHE
[pve-kernel-3.10.0.git] / config-3.10.0.diff
CommitLineData
062da07d 1--- rh-kernel-src/kernel-3.10.0-x86_64.config 2014-04-23 09:14:23.000000000 +0200
bfcb7405 2+++ config-3.10.0 2014-05-02 05:56:00.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
2600940a
DM
75@@ -1303,6 +1293,9 @@
76 # CONFIG_NET_9P is not set
77 # CONFIG_CAIF is not set
78 # CONFIG_CEPH_LIB is not set
79+CONFIG_CEPH_LIB=m
80+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
81+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
82 # CONFIG_NFC is not set
83 CONFIG_HAVE_BPF_JIT=y
84
85@@ -1435,10 +1428,11 @@
86 # CONFIG_BLK_DEV_UMEM is not set
87 # CONFIG_BLK_DEV_COW_COMMON is not set
9ed71929 88 CONFIG_BLK_DEV_LOOP=m
2600940a
DM
89-CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
90+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
9ed71929
DM
91 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
92-# CONFIG_BLK_DEV_DRBD is not set
2600940a 93-# CONFIG_BLK_DEV_NBD is not set
9ed71929
DM
94+CONFIG_BLK_DEV_DRBD=m
95+# CONFIG_DRBD_FAULT_INJECTION is not set
2600940a 96+CONFIG_BLK_DEV_NBD=m
9ed71929
DM
97 CONFIG_BLK_DEV_NVME=m
98 CONFIG_BLK_DEV_OSD=m
2600940a
DM
99 CONFIG_BLK_DEV_SX8=m
100@@ -1453,7 +1447,7 @@
101 CONFIG_XEN_BLKDEV_FRONTEND=m
102 CONFIG_VIRTIO_BLK=m
103 # CONFIG_BLK_DEV_HD is not set
104-# CONFIG_BLK_DEV_RBD is not set
105+CONFIG_BLK_DEV_RBD=m
106 # CONFIG_BLK_DEV_RSXX is not set
107
108 #
109@@ -1531,10 +1525,10 @@
688f31fc
DM
110 #
111 # SCSI support type (disk, tape, CD-ROM)
112 #
113-CONFIG_BLK_DEV_SD=m
114+CONFIG_BLK_DEV_SD=y
115 CONFIG_CHR_DEV_ST=m
116 CONFIG_CHR_DEV_OSST=m
117-CONFIG_BLK_DEV_SR=m
118+CONFIG_BLK_DEV_SR=y
119 CONFIG_BLK_DEV_SR_VENDOR=y
120 CONFIG_CHR_DEV_SG=m
121 CONFIG_CHR_DEV_SCH=m
bfcb7405
DM
122@@ -1752,9 +1746,9 @@
123 CONFIG_MD_RAID456=m
124 # CONFIG_MD_MULTIPATH is not set
688f31fc 125 CONFIG_MD_FAULTY=m
bfcb7405
DM
126-# CONFIG_BCACHE is not set
127+CONFIG_BCACHE=m
062da07d 128 CONFIG_BLK_DEV_DM_BUILTIN=y
688f31fc
DM
129-CONFIG_BLK_DEV_DM=m
130+CONFIG_BLK_DEV_DM=y
131 CONFIG_DM_DEBUG=y
132 CONFIG_DM_BUFIO=m
133 CONFIG_DM_BIO_PRISON=m
2600940a 134@@ -4542,7 +4536,11 @@
688f31fc
DM
135 # CONFIG_JBD2_DEBUG is not set
136 CONFIG_FS_MBCACHE=m
137 # CONFIG_REISERFS_FS is not set
138-# CONFIG_JFS_FS is not set
139+CONFIG_JFS_FS=m
140+# CONFIG_JFS_POSIX_ACL is not set
141+# CONFIG_JFS_SECURITY is not set
142+# CONFIG_JFS_DEBUG is not set
143+# CONFIG_JFS_STATISTICS is not set
144 CONFIG_XFS_FS=m
145 CONFIG_XFS_QUOTA=y
146 CONFIG_XFS_POSIX_ACL=y
2600940a 147@@ -4631,8 +4629,8 @@
688f31fc
DM
148 # CONFIG_ADFS_FS is not set
149 # CONFIG_AFFS_FS is not set
150 # CONFIG_ECRYPT_FS is not set
151-# CONFIG_HFS_FS is not set
152-# CONFIG_HFSPLUS_FS is not set
153+CONFIG_HFS_FS=y
154+CONFIG_HFSPLUS_FS=y
155 # CONFIG_BEFS_FS is not set
156 # CONFIG_BFS_FS is not set
157 # CONFIG_EFS_FS is not set
2600940a 158@@ -4769,7 +4767,7 @@
688f31fc
DM
159 CONFIG_NLS_MAC_INUIT=m
160 CONFIG_NLS_MAC_ROMANIAN=m
161 CONFIG_NLS_MAC_TURKISH=m
162-CONFIG_NLS_UTF8=m
163+CONFIG_NLS_UTF8=y
164 CONFIG_DLM=m
165 CONFIG_DLM_DEBUG=y
166
2600940a 167@@ -4958,8 +4956,8 @@
062da07d
DM
168 CONFIG_KEYS=y
169 CONFIG_PERSISTENT_KEYRINGS=y
170 CONFIG_BIG_KEYS=y
171-CONFIG_TRUSTED_KEYS=y
172-CONFIG_ENCRYPTED_KEYS=y
173+CONFIG_TRUSTED_KEYS=m
174+CONFIG_ENCRYPTED_KEYS=m
175 CONFIG_KEYS_DEBUG_PROC_KEYS=y
176 # CONFIG_SECURITY_DMESG_RESTRICT is not set
177 CONFIG_SECURITY=y
2600940a 178@@ -4971,9 +4969,8 @@
f396caf4
DM
179 CONFIG_INTEL_TXT=y
180 CONFIG_LSM_MMAP_MIN_ADDR=65535
181 CONFIG_SECURITY_SELINUX=y
182-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
183-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
184-CONFIG_SECURITY_SELINUX_DISABLE=y
185+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
186+# CONFIG_SECURITY_SELINUX_DISABLE is not set
187 CONFIG_SECURITY_SELINUX_DEVELOP=y
188 CONFIG_SECURITY_SELINUX_AVC_STATS=y
189 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
2600940a 190@@ -4992,9 +4989,9 @@
062da07d
DM
191 CONFIG_IMA_APPRAISE=y
192 CONFIG_EVM=y
193 CONFIG_EVM_HMAC_VERSION=2
f396caf4
DM
194-CONFIG_DEFAULT_SECURITY_SELINUX=y
195-# CONFIG_DEFAULT_SECURITY_DAC is not set
196-CONFIG_DEFAULT_SECURITY="selinux"
197+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
198+CONFIG_DEFAULT_SECURITY_DAC=y
199+CONFIG_DEFAULT_SECURITY=""
200 CONFIG_XOR_BLOCKS=m
201 CONFIG_ASYNC_CORE=m
202 CONFIG_ASYNC_MEMCPY=m
2600940a 203@@ -5066,7 +5063,7 @@
688f31fc
DM
204 CONFIG_CRYPTO_CRC32C_INTEL=m
205 CONFIG_CRYPTO_CRC32=m
206 CONFIG_CRYPTO_CRC32_PCLMUL=m
207-CONFIG_CRYPTO_CRCT10DIF=m
208+CONFIG_CRYPTO_CRCT10DIF=y
209 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
210 CONFIG_CRYPTO_GHASH=m
211 CONFIG_CRYPTO_MD4=m
2600940a 212@@ -5180,7 +5177,7 @@
062da07d 213 CONFIG_CMPXCHG_LOCKREF=y
688f31fc
DM
214 CONFIG_CRC_CCITT=m
215 CONFIG_CRC16=y
216-CONFIG_CRC_T10DIF=m
217+CONFIG_CRC_T10DIF=y
218 CONFIG_CRC_ITU_T=m
219 CONFIG_CRC32=y
220 # CONFIG_CRC32_SELFTEST is not set
2600940a 221@@ -5227,6 +5224,7 @@
9ed71929
DM
222 CONFIG_DQL=y
223 CONFIG_NLATTR=y
224 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
225+CONFIG_LRU_CACHE=m
226 CONFIG_AVERAGE=y
227 CONFIG_CLZ_TAB=y
228 CONFIG_CORDIC=m