diff options
author | Rob Herring <robh@kernel.org> | 2016-10-11 13:54:41 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-02-05 08:58:36 -0800 |
commit | d31dd9f2a24d774d18c69a7fb768bdc145a7784e (patch) | |
tree | 73cae850495ca46d4a4748d7d5efa08e76ad97c0 /kernel/configs | |
parent | 258e4752645454cb63b4a3c4a1dcad402925e74b (diff) |
UPSTREAM: config: android: set SELinux as default security mode
Android won't boot without SELinux enabled, so make it the default.
Link: http://lkml.kernel.org/r/20160908185934.18098-2-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d90ae51a3e7556c9f50431db43cd8190934ccf94)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'kernel/configs')
-rw-r--r-- | kernel/configs/android-base.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index da8b3e9deac6..248070e0d61d 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -18,6 +18,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_DEFAULT_SECURITY_SELINUX=y CONFIG_EMBEDDED=y CONFIG_FB=y CONFIG_HIGH_RES_TIMERS=y |