diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 15:49:07 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-10-30 15:49:07 -0400 |
| commit | ede75f6f8f84592ab0a2440327a0dd92912171f7 (patch) | |
| tree | c83b220c63c85d04820034ffda7fac25bdc60481 /config-x86_64-generic | |
| parent | 23aad7f77fd1d1fd894c77db19f057728acacb02 (diff) | |
| download | kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.gz kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.tar.xz kernel-ede75f6f8f84592ab0a2440327a0dd92912171f7.zip | |
Update config options for 3.7
- Fix module blacklist patch to not leak a reference to the blacklist keyring
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 342b8620a..6003f11c0 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -46,6 +46,8 @@ CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m @@ -107,6 +109,7 @@ CONFIG_X86_X2APIC=y CONFIG_SPARSE_IRQ=y CONFIG_RCU_FANOUT=64 +# CONFIG_RCU_USER_QS is not set CONFIG_INTEL_TXT=y |