From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 16 Mar 2016 07:14:59 +0000 (+0800)
Subject: ARM64: rockchip_defconfig: enable selinux
X-Git-Tag: firefly_0821_release~3172
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=99b46d52544053ded5187856c632e21ba6329839;p=firefly-linux-kernel-4.4.55.git

ARM64: rockchip_defconfig: enable selinux

Change-Id: I0142795593483474ee157ed2d64cc0fb18f2ef44
Fixes: 361ddf2d6908 ("arm64: rockchip: rockchip_defconfig updates for 4.4")
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 3f4313daa5f3..8897eb2a165d 100644
--- 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