Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-03-21 07:19:28 +0100
committerMichal Kubecek <mkubecek@suse.cz>2019-03-21 07:24:29 +0100
commitfd9504571d37412e72584320d6e50476023b0485 (patch)
treeaf080aaad60bc622e6b97d62a6002d1421888f33
parent32e1c6ee68e54f5b7999dc809e2a7e6acb3dcf06 (diff)
config: apply recent changes to ARM configsHEADmaster
- CONFIG_PREEMPT_VOLUNTARY=y - disable CONFIG_IMA_ARCH_POLICY - enable CONFIG_IMA_APPRAISE_BOOTPARAM - CONFIG_LSM=""
-rw-r--r--config/arm64/default9
-rw-r--r--config/armv6hl/default13
-rw-r--r--config/armv7hl/default26
-rw-r--r--config/armv7hl/lpae26
-rw-r--r--config/s390x/zfcpdump2
5 files changed, 39 insertions, 37 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 47d04b5a78..8445fe1a08 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -4,10 +4,10 @@
#
#
-# Compiler: aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.2-2018-08 (arm-rel-8.23)) 8.2.1 20180802
+# Compiler: aarch64-suse-linux-gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204]
#
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80201
+CONFIG_GCC_VERSION=80301
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
@@ -9480,14 +9480,15 @@ CONFIG_IMA_DEFAULT_HASH="sha256"
# CONFIG_IMA_WRITE_POLICY is not set
CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_ARCH_POLICY=y
+# CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
# CONFIG_IMA_TRUSTED_KEYRING is not set
CONFIG_EVM=y
CONFIG_EVM_ATTR_FSUUID=y
CONFIG_EVM_ADD_XATTRS=y
# CONFIG_EVM_LOAD_X509 is not set
-CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
+CONFIG_LSM=""
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
diff --git a/config/armv6hl/default b/config/armv6hl/default
index f64cd559a1..6c1b97062a 100644
--- a/config/armv6hl/default
+++ b/config/armv6hl/default
@@ -4,10 +4,10 @@
#
#
-# Compiler: arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.2-2019.01 (arm-rel-8.28)) 8.2.1 20180802
+# Compiler: arm-suse-linux-gnueabi-gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204]
#
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80201
+CONFIG_GCC_VERSION=80301
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
@@ -74,8 +74,8 @@ CONFIG_NO_HZ_COMMON=y
CONFIG_NO_HZ_IDLE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
#
@@ -6980,14 +6980,15 @@ CONFIG_IMA_DEFAULT_HASH="sha256"
# CONFIG_IMA_WRITE_POLICY is not set
CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_ARCH_POLICY=y
+# CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
# CONFIG_IMA_TRUSTED_KEYRING is not set
CONFIG_EVM=y
CONFIG_EVM_ATTR_FSUUID=y
CONFIG_EVM_ADD_XATTRS=y
# CONFIG_EVM_LOAD_X509 is not set
-CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
+CONFIG_LSM=""
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
diff --git a/config/armv7hl/default b/config/armv7hl/default
index f1819c57b8..5f37c7da57 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -4,10 +4,10 @@
#
#
-# Compiler: arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.2-2019.01 (arm-rel-8.28)) 8.2.1 20180802
+# Compiler: arm-suse-linux-gnueabi-gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204]
#
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80201
+CONFIG_GCC_VERSION=80301
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
@@ -81,9 +81,8 @@ CONFIG_NO_HZ_IDLE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
#
# CPU/Task time and stats accounting
@@ -104,7 +103,7 @@ CONFIG_CPU_ISOLATION=y
#
# RCU Subsystem
#
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
@@ -1010,7 +1009,11 @@ CONFIG_IOSCHED_BFQ=y
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5720,7 +5723,6 @@ CONFIG_DVB_C8SECTPFE=m
CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CROS_EC_CEC=m
CONFIG_VIDEO_MESON_AO_CEC=m
-CONFIG_CEC_GPIO=m
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
CONFIG_VIDEO_STI_HDMI_CEC=m
CONFIG_VIDEO_TEGRA_HDMI_CEC=m
@@ -9701,14 +9703,15 @@ CONFIG_IMA_DEFAULT_HASH="sha256"
# CONFIG_IMA_WRITE_POLICY is not set
CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_ARCH_POLICY=y
+# CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
# CONFIG_IMA_TRUSTED_KEYRING is not set
CONFIG_EVM=y
CONFIG_EVM_ATTR_FSUUID=y
CONFIG_EVM_ADD_XATTRS=y
# CONFIG_EVM_LOAD_X509 is not set
-CONFIG_LSM=" "
+CONFIG_LSM=""
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
@@ -10142,7 +10145,6 @@ CONFIG_SCHED_INFO=y
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_STACK_END_CHECK=y
# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_DEBUG_PREEMPT is not set
#
# Lock Debugging (spinlocks, mutexes, etc...)
@@ -10219,10 +10221,8 @@ CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_TRACE_PREEMPT_TOGGLE=y
CONFIG_PREEMPTIRQ_EVENTS=y
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
# CONFIG_HWLAT_TRACER is not set
CONFIG_FTRACE_SYSCALLS=y
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index 7207c5db93..ecbe52b84e 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -4,10 +4,10 @@
#
#
-# Compiler: arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.2-2019.01 (arm-rel-8.28)) 8.2.1 20180802
+# Compiler: arm-suse-linux-gnueabi-gcc (SUSE Linux) 8.3.1 20190226 [gcc-8-branch revision 269204]
#
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80201
+CONFIG_GCC_VERSION=80301
# CONFIG_CC_IS_CLANG is not set
CONFIG_CLANG_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
@@ -81,9 +81,8 @@ CONFIG_NO_HZ_IDLE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
#
# CPU/Task time and stats accounting
@@ -104,7 +103,7 @@ CONFIG_CPU_ISOLATION=y
#
# RCU Subsystem
#
-CONFIG_PREEMPT_RCU=y
+CONFIG_TREE_RCU=y
# CONFIG_RCU_EXPERT is not set
CONFIG_SRCU=y
CONFIG_TREE_SRCU=y
@@ -970,7 +969,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_PADATA=y
CONFIG_ASN1=y
-CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -5503,7 +5506,6 @@ CONFIG_DVB_C8SECTPFE=m
CONFIG_CEC_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CROS_EC_CEC=m
# CONFIG_VIDEO_MESON_AO_CEC is not set
-CONFIG_CEC_GPIO=m
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
CONFIG_VIDEO_TEGRA_HDMI_CEC=m
CONFIG_SDR_PLATFORM_DRIVERS=y
@@ -9296,14 +9298,15 @@ CONFIG_IMA_DEFAULT_HASH="sha256"
# CONFIG_IMA_WRITE_POLICY is not set
CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_APPRAISE=y
-CONFIG_IMA_ARCH_POLICY=y
+# CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
# CONFIG_IMA_TRUSTED_KEYRING is not set
CONFIG_EVM=y
CONFIG_EVM_ATTR_FSUUID=y
CONFIG_EVM_ADD_XATTRS=y
# CONFIG_EVM_LOAD_X509 is not set
-CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
+CONFIG_LSM=""
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
@@ -9732,7 +9735,6 @@ CONFIG_SCHED_INFO=y
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_STACK_END_CHECK=y
# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_DEBUG_PREEMPT is not set
#
# Lock Debugging (spinlocks, mutexes, etc...)
@@ -9809,10 +9811,8 @@ CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_TRACE_PREEMPT_TOGGLE=y
CONFIG_PREEMPTIRQ_EVENTS=y
# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
# CONFIG_HWLAT_TRACER is not set
CONFIG_FTRACE_SYSCALLS=y
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 7e6b680178..d6885d53d9 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1104,7 +1104,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
# CONFIG_HARDENED_USERCOPY is not set
CONFIG_FORTIFY_SOURCE=y
# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_LSM=" "
+CONFIG_LSM=""
CONFIG_CRYPTO=y
#