projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9dd79fc)
ARM64: rockchip_defconfig: enable selinux
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 16 Mar 2016 07:14:59 +0000 (15:14 +0800)
committerGerrit Code Review <gerrit@rock-chips.com>
Wed, 16 Mar 2016 08:36:05 +0000 (16:36 +0800)
Change-Id: I0142795593483474ee157ed2d64cc0fb18f2ef44
Fixes: 361ddf2d6908 ("arm64: rockchip: rockchip_defconfig updates for 4.4")
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
arch/arm64/configs/rockchip_defconfig patch | blob | history

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 3f4313daa5f38f6e0f2d98323e7173e67d0f4b31..8897eb2a165da27c98bbd6595d429c978d418f4c 100644 (file)
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -562,8 +562,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_LSM_MMAP_MIN_ADDR=4096
 CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
Unnamed repository; edit this file 'description' to name the repository.