From 860652f4b9da40c80ae96d55778a3cd887514e3d Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 3 Mar 2020 23:28:18 +0800 Subject: kernel: 5.4: move some kconfig options to generic CONFIG_64BIT_TIME=y CONFIG_KASAN_STACK=1 CONFIG_UBSAN_ALIGNMENT=y CONFIG_UNIX_SCM=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_OF_RESERVED_MEM=y Signed-off-by: Yousong Zhou --- target/linux/x86/config-5.4 | 4 ---- 1 file changed, 4 deletions(-) (limited to 'target/linux/x86') diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4 index 676383efe3..3207025bbf 100644 --- a/target/linux/x86/config-5.4 +++ b/target/linux/x86/config-5.4 @@ -1,6 +1,5 @@ # CONFIG_60XX_WDT is not set # CONFIG_64BIT is not set -CONFIG_64BIT_TIME=y # CONFIG_ACPI is not set # CONFIG_ACQUIRE_WDT is not set # CONFIG_ADVANTECH_WDT is not set @@ -297,7 +296,6 @@ CONFIG_ISA_DMA_API=y # CONFIG_ITCO_WDT is not set CONFIG_JBD2=y CONFIG_KALLSYMS=y -CONFIG_KASAN_STACK=1 CONFIG_KEXEC=y CONFIG_KEXEC_CORE=y CONFIG_KEYBOARD_ATKBD=y @@ -437,8 +435,6 @@ CONFIG_TINY_SRCU=y # CONFIG_TI_CPSW_PHY_SEL is not set # CONFIG_TOSHIBA is not set # CONFIG_TQMX86_WDT is not set -CONFIG_UBSAN_ALIGNMENT=y -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_FRAME_POINTER=y # CONFIG_UNWINDER_GUESS is not set CONFIG_UP_LATE_INIT=y -- cgit v1.2.3