summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-10-11 13:54:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-11 15:06:32 -0700
commit2489a1771aae86062c637f0eb7a06129681208b1 (patch)
tree56065613821a916e3b6a996f1f3de14b46a98742 /kernel
parentd90ae51a3e7556c9f50431db43cd8190934ccf94 (diff)
downloadop-kernel-dev-2489a1771aae86062c637f0eb7a06129681208b1.zip
op-kernel-dev-2489a1771aae86062c637f0eb7a06129681208b1.tar.gz
config: android: enable CONFIG_SECCOMP
As of Android N, SECCOMP is required. Without it, we will get mediaextractor error: E /system/bin/mediaextractor: libminijail: prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER): Invalid argument Link: http://lkml.kernel.org/r/20160908185934.18098-3-robh@kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: John Stultz <john.stultz@linaro.org> Cc: Amit Pundir <amit.pundir@linaro.org> Cc: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/configs/android-base.config1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index 248070e..1a8f34f 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -131,6 +131,7 @@ CONFIG_PREEMPT=y
CONFIG_QUOTA=y
CONFIG_RTC_CLASS=y
CONFIG_RT_GROUP_SCHED=y
+CONFIG_SECCOMP=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_SELINUX=y
OpenPOWER on IntegriCloud