From 8b35da1552e844a47706aa3cde5115f0561a6492 Mon Sep 17 00:00:00 2001 From: Stijn Tintel <stijn@linux-ipv6.be> Date: Tue, 2 Jan 2018 18:53:04 +0100 Subject: [PATCH] kernel: move CONFIG_KASAN to generic config While bumping 4.14, the kernel build failed due to missing CONFIG_KASAN symbol. Move it to generic config instead of defining it for all arm64 and x86/64 targets. It was only added in 4.0, so not needed in config-3.18. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> --- target/linux/armvirt/64/config-default | 1 - target/linux/brcm2708/bcm2710/config-4.9 | 1 - target/linux/generic/config-4.14 | 1 + target/linux/generic/config-4.4 | 1 + target/linux/generic/config-4.9 | 1 + target/linux/layerscape/armv8_64b/config-4.9 | 1 - target/linux/sunxi/cortexa53/config-default | 1 - 7 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/linux/armvirt/64/config-default b/target/linux/armvirt/64/config-default index 6557d5cc5b..c58863dc8a 100644 --- a/target/linux/armvirt/64/config-default +++ b/target/linux/armvirt/64/config-default @@ -116,7 +116,6 @@ CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_CAVIUM is not set CONFIG_HW_RANDOM_VIRTIO=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -# CONFIG_KASAN is not set CONFIG_LCD_CLASS_DEVICE=m # CONFIG_LCD_PLATFORM is not set # CONFIG_LIQUIDIO is not set diff --git a/target/linux/brcm2708/bcm2710/config-4.9 b/target/linux/brcm2708/bcm2710/config-4.9 index ae4a2c7bfc..af69f080b0 100644 --- a/target/linux/brcm2708/bcm2710/config-4.9 +++ b/target/linux/brcm2708/bcm2710/config-4.9 @@ -276,7 +276,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -# CONFIG_KASAN is not set # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGER_INPUT=y diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index 546d689f99..f156cda85c 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -2149,6 +2149,7 @@ CONFIG_JOLIET=y CONFIG_KALLSYMS_BASE_RELATIVE=y # CONFIG_KALLSYMS_UNCOMPRESSED is not set # CONFIG_KARMA_PARTITION is not set +# CONFIG_KASAN is not set # CONFIG_KCOV is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_CAT is not set diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4 index 23ed22d4c3..78163d0324 100644 --- a/target/linux/generic/config-4.4 +++ b/target/linux/generic/config-4.4 @@ -1821,6 +1821,7 @@ CONFIG_JOLIET=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_UNCOMPRESSED is not set # CONFIG_KARMA_PARTITION is not set +# CONFIG_KASAN is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_CAT is not set # CONFIG_KERNEL_GZIP is not set diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9 index 998d60297d..6ba893867a 100644 --- a/target/linux/generic/config-4.9 +++ b/target/linux/generic/config-4.9 @@ -2047,6 +2047,7 @@ CONFIG_JOLIET=y CONFIG_KALLSYMS_BASE_RELATIVE=y # CONFIG_KALLSYMS_UNCOMPRESSED is not set # CONFIG_KARMA_PARTITION is not set +# CONFIG_KASAN is not set # CONFIG_KCOV is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_CAT is not set diff --git a/target/linux/layerscape/armv8_64b/config-4.9 b/target/linux/layerscape/armv8_64b/config-4.9 index 9e0c8e0324..546e589beb 100644 --- a/target/linux/layerscape/armv8_64b/config-4.9 +++ b/target/linux/layerscape/armv8_64b/config-4.9 @@ -702,7 +702,6 @@ CONFIG_JBD2=y CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y -# CONFIG_KASAN is not set CONFIG_KEXEC=y CONFIG_KEXEC_CORE=y CONFIG_KEYBOARD_ATKBD=y diff --git a/target/linux/sunxi/cortexa53/config-default b/target/linux/sunxi/cortexa53/config-default index 527a6f6979..bb94574da7 100644 --- a/target/linux/sunxi/cortexa53/config-default +++ b/target/linux/sunxi/cortexa53/config-default @@ -61,7 +61,6 @@ CONFIG_HAVE_KVM_MSI=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_HAVE_PATA_PLATFORM=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -# CONFIG_KASAN is not set CONFIG_KERNEL_MODE_NEON=y CONFIG_KVM_ARM_PMU=y CONFIG_KVM_ARM_VGIC_V3_ITS=y -- 2.25.1