diff options
26 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig index 18c311ae1113..0b9211b2b73b 100644 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ b/arch/arm/configs/colibri_pxa270_defconfig | |||
@@ -166,7 +166,6 @@ CONFIG_DEBUG_USER=y | |||
166 | CONFIG_DEBUG_ERRORS=y | 166 | CONFIG_DEBUG_ERRORS=y |
167 | CONFIG_DEBUG_LL=y | 167 | CONFIG_DEBUG_LL=y |
168 | CONFIG_KEYS=y | 168 | CONFIG_KEYS=y |
169 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
170 | CONFIG_SECURITY=y | 169 | CONFIG_SECURITY=y |
171 | CONFIG_CRYPTO_PCBC=m | 170 | CONFIG_CRYPTO_PCBC=m |
172 | CONFIG_CRYPTO_SHA1=m | 171 | CONFIG_CRYPTO_SHA1=m |
diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig index 4fa94a1f115b..652b7bd9e544 100644 --- a/arch/arm/configs/iop13xx_defconfig +++ b/arch/arm/configs/iop13xx_defconfig | |||
@@ -95,7 +95,6 @@ CONFIG_PARTITION_ADVANCED=y | |||
95 | CONFIG_NLS=y | 95 | CONFIG_NLS=y |
96 | CONFIG_DEBUG_USER=y | 96 | CONFIG_DEBUG_USER=y |
97 | CONFIG_KEYS=y | 97 | CONFIG_KEYS=y |
98 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
99 | CONFIG_CRYPTO_NULL=y | 98 | CONFIG_CRYPTO_NULL=y |
100 | CONFIG_CRYPTO_LRW=y | 99 | CONFIG_CRYPTO_LRW=y |
101 | CONFIG_CRYPTO_PCBC=m | 100 | CONFIG_CRYPTO_PCBC=m |
diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig index c3058da631da..aa3af0a6b8f7 100644 --- a/arch/arm/configs/iop32x_defconfig +++ b/arch/arm/configs/iop32x_defconfig | |||
@@ -108,7 +108,6 @@ CONFIG_DEBUG_USER=y | |||
108 | CONFIG_DEBUG_LL=y | 108 | CONFIG_DEBUG_LL=y |
109 | CONFIG_DEBUG_LL_UART_8250=y | 109 | CONFIG_DEBUG_LL_UART_8250=y |
110 | CONFIG_KEYS=y | 110 | CONFIG_KEYS=y |
111 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
112 | CONFIG_CRYPTO_NULL=y | 111 | CONFIG_CRYPTO_NULL=y |
113 | CONFIG_CRYPTO_LRW=y | 112 | CONFIG_CRYPTO_LRW=y |
114 | CONFIG_CRYPTO_PCBC=m | 113 | CONFIG_CRYPTO_PCBC=m |
diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index 4bc870028035..0ada29d568ec 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig | |||
@@ -214,7 +214,6 @@ CONFIG_MAGIC_SYSRQ=y | |||
214 | CONFIG_DEBUG_FS=y | 214 | CONFIG_DEBUG_FS=y |
215 | CONFIG_DEBUG_USER=y | 215 | CONFIG_DEBUG_USER=y |
216 | CONFIG_KEYS=y | 216 | CONFIG_KEYS=y |
217 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
218 | CONFIG_SECURITY=y | 217 | CONFIG_SECURITY=y |
219 | CONFIG_CRYPTO_PCBC=m | 218 | CONFIG_CRYPTO_PCBC=m |
220 | CONFIG_CRYPTO_SHA256=m | 219 | CONFIG_CRYPTO_SHA256=m |
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig index e2f6543b91e7..dc5dd5b69fde 100644 --- a/arch/microblaze/configs/mmu_defconfig +++ b/arch/microblaze/configs/mmu_defconfig | |||
@@ -87,5 +87,4 @@ CONFIG_KGDB_KDB=y | |||
87 | CONFIG_EARLY_PRINTK=y | 87 | CONFIG_EARLY_PRINTK=y |
88 | CONFIG_KEYS=y | 88 | CONFIG_KEYS=y |
89 | CONFIG_ENCRYPTED_KEYS=y | 89 | CONFIG_ENCRYPTED_KEYS=y |
90 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
91 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 90 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig index a29ebd4a9fcb..4cdaf565e638 100644 --- a/arch/microblaze/configs/nommu_defconfig +++ b/arch/microblaze/configs/nommu_defconfig | |||
@@ -92,7 +92,6 @@ CONFIG_DEBUG_INFO=y | |||
92 | CONFIG_EARLY_PRINTK=y | 92 | CONFIG_EARLY_PRINTK=y |
93 | CONFIG_KEYS=y | 93 | CONFIG_KEYS=y |
94 | CONFIG_ENCRYPTED_KEYS=y | 94 | CONFIG_ENCRYPTED_KEYS=y |
95 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
96 | CONFIG_CRYPTO_ECB=y | 95 | CONFIG_CRYPTO_ECB=y |
97 | CONFIG_CRYPTO_MD4=y | 96 | CONFIG_CRYPTO_MD4=y |
98 | CONFIG_CRYPTO_MD5=y | 97 | CONFIG_CRYPTO_MD5=y |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index b3e7a1b61220..e070dac071c8 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -247,7 +247,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y | |||
247 | CONFIG_DEBUG_MEMORY_INIT=y | 247 | CONFIG_DEBUG_MEMORY_INIT=y |
248 | CONFIG_DEBUG_LIST=y | 248 | CONFIG_DEBUG_LIST=y |
249 | CONFIG_KEYS=y | 249 | CONFIG_KEYS=y |
250 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
251 | CONFIG_SECURITY=y | 250 | CONFIG_SECURITY=y |
252 | CONFIG_SECURITY_NETWORK=y | 251 | CONFIG_SECURITY_NETWORK=y |
253 | CONFIG_SECURITY_NETWORK_XFRM=y | 252 | CONFIG_SECURITY_NETWORK_XFRM=y |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 57ed466e00db..6ba9ce9fcdd5 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
@@ -358,7 +358,6 @@ CONFIG_DLM=m | |||
358 | CONFIG_DEBUG_MEMORY_INIT=y | 358 | CONFIG_DEBUG_MEMORY_INIT=y |
359 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 359 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
360 | CONFIG_KEYS=y | 360 | CONFIG_KEYS=y |
361 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
362 | CONFIG_CRYPTO_FIPS=y | 361 | CONFIG_CRYPTO_FIPS=y |
363 | CONFIG_CRYPTO_NULL=m | 362 | CONFIG_CRYPTO_NULL=m |
364 | CONFIG_CRYPTO_CRYPTD=m | 363 | CONFIG_CRYPTO_CRYPTD=m |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 48e16d98b2cc..77e9f505f5e4 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -346,7 +346,6 @@ CONFIG_PARTITION_ADVANCED=y | |||
346 | CONFIG_DLM=m | 346 | CONFIG_DLM=m |
347 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 347 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
348 | CONFIG_KEYS=y | 348 | CONFIG_KEYS=y |
349 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
350 | CONFIG_SECURITYFS=y | 349 | CONFIG_SECURITYFS=y |
351 | CONFIG_CRYPTO_FIPS=y | 350 | CONFIG_CRYPTO_FIPS=y |
352 | CONFIG_CRYPTO_NULL=m | 351 | CONFIG_CRYPTO_NULL=m |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index fe48220157a9..f9af98f63cff 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
@@ -181,7 +181,6 @@ CONFIG_MAGIC_SYSRQ=y | |||
181 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 181 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
182 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 182 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
183 | CONFIG_KEYS=y | 183 | CONFIG_KEYS=y |
184 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
185 | CONFIG_CRYPTO_NULL=y | 184 | CONFIG_CRYPTO_NULL=y |
186 | CONFIG_CRYPTO_CBC=y | 185 | CONFIG_CRYPTO_CBC=y |
187 | CONFIG_CRYPTO_ECB=y | 186 | CONFIG_CRYPTO_ECB=y |
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig index 4f37a5985459..a5e85e1ee5de 100644 --- a/arch/mips/configs/jazz_defconfig +++ b/arch/mips/configs/jazz_defconfig | |||
@@ -362,7 +362,6 @@ CONFIG_NLS_KOI8_R=m | |||
362 | CONFIG_NLS_KOI8_U=m | 362 | CONFIG_NLS_KOI8_U=m |
363 | CONFIG_NLS_UTF8=m | 363 | CONFIG_NLS_UTF8=m |
364 | CONFIG_DLM=m | 364 | CONFIG_DLM=m |
365 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
366 | CONFIG_CRYPTO_NULL=m | 365 | CONFIG_CRYPTO_NULL=m |
367 | CONFIG_CRYPTO_ECB=m | 366 | CONFIG_CRYPTO_ECB=m |
368 | CONFIG_CRYPTO_LRW=m | 367 | CONFIG_CRYPTO_LRW=m |
diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig index 004cf52d1b7d..d1f198b072a0 100644 --- a/arch/mips/configs/lemote2f_defconfig +++ b/arch/mips/configs/lemote2f_defconfig | |||
@@ -412,7 +412,6 @@ CONFIG_DEBUG_FS=y | |||
412 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 412 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
413 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 413 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
414 | CONFIG_KEYS=y | 414 | CONFIG_KEYS=y |
415 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
416 | CONFIG_CRYPTO_FIPS=y | 415 | CONFIG_CRYPTO_FIPS=y |
417 | CONFIG_CRYPTO_NULL=m | 416 | CONFIG_CRYPTO_NULL=m |
418 | CONFIG_CRYPTO_CRYPTD=m | 417 | CONFIG_CRYPTO_CRYPTD=m |
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index db029f4ff759..82db4e3e4cf1 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
@@ -453,7 +453,6 @@ CONFIG_NLS_KOI8_R=m | |||
453 | CONFIG_NLS_KOI8_U=m | 453 | CONFIG_NLS_KOI8_U=m |
454 | CONFIG_NLS_UTF8=m | 454 | CONFIG_NLS_UTF8=m |
455 | CONFIG_DLM=m | 455 | CONFIG_DLM=m |
456 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
457 | CONFIG_CRYPTO_NULL=m | 456 | CONFIG_CRYPTO_NULL=m |
458 | CONFIG_CRYPTO_ECB=m | 457 | CONFIG_CRYPTO_ECB=m |
459 | CONFIG_CRYPTO_LRW=m | 458 | CONFIG_CRYPTO_LRW=m |
diff --git a/arch/mips/configs/sb1250_swarm_defconfig b/arch/mips/configs/sb1250_swarm_defconfig index 51bab13ef6f8..7fca09fedb59 100644 --- a/arch/mips/configs/sb1250_swarm_defconfig +++ b/arch/mips/configs/sb1250_swarm_defconfig | |||
@@ -87,7 +87,6 @@ CONFIG_NFS_V3=y | |||
87 | CONFIG_ROOT_NFS=y | 87 | CONFIG_ROOT_NFS=y |
88 | CONFIG_DLM=m | 88 | CONFIG_DLM=m |
89 | CONFIG_KEYS=y | 89 | CONFIG_KEYS=y |
90 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
91 | CONFIG_CRYPTO_NULL=m | 90 | CONFIG_CRYPTO_NULL=m |
92 | CONFIG_CRYPTO_CRYPTD=m | 91 | CONFIG_CRYPTO_CRYPTD=m |
93 | CONFIG_CRYPTO_AUTHENC=m | 92 | CONFIG_CRYPTO_AUTHENC=m |
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig index 9387cc2693f6..db8f56bf3883 100644 --- a/arch/parisc/configs/712_defconfig +++ b/arch/parisc/configs/712_defconfig | |||
@@ -183,7 +183,6 @@ CONFIG_DEBUG_KERNEL=y | |||
183 | CONFIG_DEBUG_MUTEXES=y | 183 | CONFIG_DEBUG_MUTEXES=y |
184 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 184 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
185 | CONFIG_DEBUG_RODATA=y | 185 | CONFIG_DEBUG_RODATA=y |
186 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
187 | CONFIG_CRYPTO_NULL=m | 186 | CONFIG_CRYPTO_NULL=m |
188 | CONFIG_CRYPTO_TEST=m | 187 | CONFIG_CRYPTO_TEST=m |
189 | CONFIG_CRYPTO_HMAC=y | 188 | CONFIG_CRYPTO_HMAC=y |
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig index 0490199d7b15..1a4f776b49b8 100644 --- a/arch/parisc/configs/a500_defconfig +++ b/arch/parisc/configs/a500_defconfig | |||
@@ -193,7 +193,6 @@ CONFIG_HEADERS_CHECK=y | |||
193 | CONFIG_DEBUG_KERNEL=y | 193 | CONFIG_DEBUG_KERNEL=y |
194 | # CONFIG_DEBUG_BUGVERBOSE is not set | 194 | # CONFIG_DEBUG_BUGVERBOSE is not set |
195 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 195 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
196 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
197 | CONFIG_CRYPTO_NULL=m | 196 | CONFIG_CRYPTO_NULL=m |
198 | CONFIG_CRYPTO_TEST=m | 197 | CONFIG_CRYPTO_TEST=m |
199 | CONFIG_CRYPTO_HMAC=y | 198 | CONFIG_CRYPTO_HMAC=y |
diff --git a/arch/parisc/configs/default_defconfig b/arch/parisc/configs/default_defconfig index 4d8127e8428a..310b6657e4ac 100644 --- a/arch/parisc/configs/default_defconfig +++ b/arch/parisc/configs/default_defconfig | |||
@@ -211,7 +211,6 @@ CONFIG_DEBUG_KERNEL=y | |||
211 | CONFIG_DEBUG_MUTEXES=y | 211 | CONFIG_DEBUG_MUTEXES=y |
212 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 212 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
213 | CONFIG_KEYS=y | 213 | CONFIG_KEYS=y |
214 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
215 | CONFIG_CRYPTO_NULL=m | 214 | CONFIG_CRYPTO_NULL=m |
216 | CONFIG_CRYPTO_TEST=m | 215 | CONFIG_CRYPTO_TEST=m |
217 | CONFIG_CRYPTO_MD4=m | 216 | CONFIG_CRYPTO_MD4=m |
diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig index 0ffb08ff5125..5b04d703a924 100644 --- a/arch/parisc/configs/generic-32bit_defconfig +++ b/arch/parisc/configs/generic-32bit_defconfig | |||
@@ -301,7 +301,6 @@ CONFIG_RCU_CPU_STALL_INFO=y | |||
301 | CONFIG_LATENCYTOP=y | 301 | CONFIG_LATENCYTOP=y |
302 | CONFIG_LKDTM=m | 302 | CONFIG_LKDTM=m |
303 | CONFIG_KEYS=y | 303 | CONFIG_KEYS=y |
304 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
305 | CONFIG_CRYPTO_NULL=m | 304 | CONFIG_CRYPTO_NULL=m |
306 | CONFIG_CRYPTO_TEST=m | 305 | CONFIG_CRYPTO_TEST=m |
307 | CONFIG_CRYPTO_HMAC=y | 306 | CONFIG_CRYPTO_HMAC=y |
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index 91862292cd55..340685caa7b8 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_defconfig | |||
@@ -387,7 +387,6 @@ CONFIG_DETECT_HUNG_TASK=y | |||
387 | CONFIG_DEBUG_SPINLOCK=y | 387 | CONFIG_DEBUG_SPINLOCK=y |
388 | CONFIG_BOOTX_TEXT=y | 388 | CONFIG_BOOTX_TEXT=y |
389 | CONFIG_PPC_EARLY_DEBUG=y | 389 | CONFIG_PPC_EARLY_DEBUG=y |
390 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
391 | CONFIG_SECURITY=y | 390 | CONFIG_SECURITY=y |
392 | CONFIG_SECURITY_NETWORK=y | 391 | CONFIG_SECURITY_NETWORK=y |
393 | CONFIG_SECURITY_SELINUX=y | 392 | CONFIG_SECURITY_SELINUX=y |
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index e5d2c3dc07f1..99ccbebabfd3 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig | |||
@@ -1175,7 +1175,6 @@ CONFIG_BLK_DEV_IO_TRACE=y | |||
1175 | CONFIG_XMON=y | 1175 | CONFIG_XMON=y |
1176 | CONFIG_BOOTX_TEXT=y | 1176 | CONFIG_BOOTX_TEXT=y |
1177 | CONFIG_PPC_EARLY_DEBUG=y | 1177 | CONFIG_PPC_EARLY_DEBUG=y |
1178 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
1179 | CONFIG_SECURITY=y | 1178 | CONFIG_SECURITY=y |
1180 | CONFIG_SECURITY_NETWORK=y | 1179 | CONFIG_SECURITY_NETWORK=y |
1181 | CONFIG_SECURITY_NETWORK_XFRM=y | 1180 | CONFIG_SECURITY_NETWORK_XFRM=y |
diff --git a/arch/score/configs/spct6600_defconfig b/arch/score/configs/spct6600_defconfig index df1edbf507a2..b2d8802f43b4 100644 --- a/arch/score/configs/spct6600_defconfig +++ b/arch/score/configs/spct6600_defconfig | |||
@@ -70,7 +70,6 @@ CONFIG_NFSD=y | |||
70 | CONFIG_NFSD_V3_ACL=y | 70 | CONFIG_NFSD_V3_ACL=y |
71 | CONFIG_NFSD_V4=y | 71 | CONFIG_NFSD_V4=y |
72 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 72 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
73 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
74 | CONFIG_SECURITY=y | 73 | CONFIG_SECURITY=y |
75 | CONFIG_SECURITY_NETWORK=y | 74 | CONFIG_SECURITY_NETWORK=y |
76 | CONFIG_CRYPTO_NULL=y | 75 | CONFIG_CRYPTO_NULL=y |
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig index 37dc9364c4a1..c1387b7f447d 100644 --- a/arch/tile/configs/tilegx_defconfig +++ b/arch/tile/configs/tilegx_defconfig | |||
@@ -374,7 +374,6 @@ CONFIG_DEBUG_CREDENTIALS=y | |||
374 | CONFIG_RCU_CPU_STALL_TIMEOUT=60 | 374 | CONFIG_RCU_CPU_STALL_TIMEOUT=60 |
375 | CONFIG_ASYNC_RAID6_TEST=m | 375 | CONFIG_ASYNC_RAID6_TEST=m |
376 | CONFIG_KGDB=y | 376 | CONFIG_KGDB=y |
377 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
378 | CONFIG_SECURITY=y | 377 | CONFIG_SECURITY=y |
379 | CONFIG_SECURITYFS=y | 378 | CONFIG_SECURITYFS=y |
380 | CONFIG_SECURITY_NETWORK=y | 379 | CONFIG_SECURITY_NETWORK=y |
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig index 76a2781dec2c..6d9ce8af1107 100644 --- a/arch/tile/configs/tilepro_defconfig +++ b/arch/tile/configs/tilepro_defconfig | |||
@@ -486,7 +486,6 @@ CONFIG_DEBUG_LIST=y | |||
486 | CONFIG_DEBUG_CREDENTIALS=y | 486 | CONFIG_DEBUG_CREDENTIALS=y |
487 | CONFIG_RCU_CPU_STALL_TIMEOUT=60 | 487 | CONFIG_RCU_CPU_STALL_TIMEOUT=60 |
488 | CONFIG_ASYNC_RAID6_TEST=m | 488 | CONFIG_ASYNC_RAID6_TEST=m |
489 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
490 | CONFIG_SECURITY=y | 489 | CONFIG_SECURITY=y |
491 | CONFIG_SECURITYFS=y | 490 | CONFIG_SECURITYFS=y |
492 | CONFIG_SECURITY_NETWORK=y | 491 | CONFIG_SECURITY_NETWORK=y |
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 028be48c8839..a212b68a4909 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -303,7 +303,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y | |||
303 | # CONFIG_DEBUG_RODATA_TEST is not set | 303 | # CONFIG_DEBUG_RODATA_TEST is not set |
304 | CONFIG_DEBUG_BOOT_PARAMS=y | 304 | CONFIG_DEBUG_BOOT_PARAMS=y |
305 | CONFIG_OPTIMIZE_INLINING=y | 305 | CONFIG_OPTIMIZE_INLINING=y |
306 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
307 | CONFIG_SECURITY=y | 306 | CONFIG_SECURITY=y |
308 | CONFIG_SECURITY_NETWORK=y | 307 | CONFIG_SECURITY_NETWORK=y |
309 | CONFIG_SECURITY_SELINUX=y | 308 | CONFIG_SECURITY_SELINUX=y |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index cb5b3ab5beec..4f404a64681b 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -300,7 +300,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y | |||
300 | # CONFIG_DEBUG_RODATA_TEST is not set | 300 | # CONFIG_DEBUG_RODATA_TEST is not set |
301 | CONFIG_DEBUG_BOOT_PARAMS=y | 301 | CONFIG_DEBUG_BOOT_PARAMS=y |
302 | CONFIG_OPTIMIZE_INLINING=y | 302 | CONFIG_OPTIMIZE_INLINING=y |
303 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
304 | CONFIG_SECURITY=y | 303 | CONFIG_SECURITY=y |
305 | CONFIG_SECURITY_NETWORK=y | 304 | CONFIG_SECURITY_NETWORK=y |
306 | CONFIG_SECURITY_SELINUX=y | 305 | CONFIG_SECURITY_SELINUX=y |
diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig index 21d756832b75..7543398b79e3 100644 --- a/security/integrity/Kconfig +++ b/security/integrity/Kconfig | |||
@@ -45,7 +45,6 @@ config INTEGRITY_TRUSTED_KEYRING | |||
45 | bool "Require all keys on the integrity keyrings be signed" | 45 | bool "Require all keys on the integrity keyrings be signed" |
46 | depends on SYSTEM_TRUSTED_KEYRING | 46 | depends on SYSTEM_TRUSTED_KEYRING |
47 | depends on INTEGRITY_ASYMMETRIC_KEYS | 47 | depends on INTEGRITY_ASYMMETRIC_KEYS |
48 | select KEYS_DEBUG_PROC_KEYS | ||
49 | default y | 48 | default y |
50 | help | 49 | help |
51 | This option requires that all keys added to the .ima and | 50 | This option requires that all keys added to the .ima and |