summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-10-30 15:49:07 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-10-30 15:49:07 -0400
commitede75f6f8f84592ab0a2440327a0dd92912171f7 (patch)
treec83b220c63c85d04820034ffda7fac25bdc60481 /config-s390x
parent23aad7f77fd1d1fd894c77db19f057728acacb02 (diff)
downloadkernel-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-s390x')
-rw-r--r--config-s390x9
1 files changed, 9 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x
index 451512e9a..41e41c53c 100644
--- a/config-s390x
+++ b/config-s390x
@@ -241,3 +241,12 @@ CONFIG_STRICT_DEVMEM=y
CONFIG_CRYPTO_GHASH_S390=m
CONFIG_NET_CORE=y
CONFIG_ETHERNET=y
+
+CONFIG_BPF_JIT=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_SCM_BUS is not set
+# CONFIG_EADM_SCH is not set
+# CONFIG_SCM_BLOCK is not set
+# CONFIG_SCM_BLOCK_CLUSTER_WRITE is not set
+# CONFIG_S390_PTDUMP is not set
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set