From e390756effa8341b3b3c7c44b339b8bfcf610b68 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 20 Jan 2018 22:44:40 +0100 Subject: [PATCH] x86: Add CONFIG_RETPOLINE to fix build This adds support for the new configuration option CONFIG_RETPOLINE and refreshes the configuration. Fixes: d8565a06dc ("kernel: bump 4.9 to 4.9.77") Fixes: 9ddfac8015 ("kernel: bump 4.14 to 4.14.14") Signed-off-by: Hauke Mehrtens --- target/linux/x86/config-4.14 | 9 ++++----- target/linux/x86/config-4.9 | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14 index b88fa77e13..184d11c8ca 100644 --- a/target/linux/x86/config-4.14 +++ b/target/linux/x86/config-4.14 @@ -20,6 +20,7 @@ CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_HAS_REFCOUNT=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -113,7 +114,6 @@ CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_NMI_SELFTEST is not set # CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_DEBUG_VIRTUAL is not set CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DEFAULT_IO_DELAY_TYPE=0 @@ -159,6 +159,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IO=y @@ -382,7 +383,6 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_PMC_ATOM=y CONFIG_POWER_SUPPLY=y -CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 # CONFIG_PROCESSOR_SELECT is not set CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set @@ -392,6 +392,7 @@ CONFIG_RATIONAL=y # CONFIG_RCU_STALL_COMMON is not set CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y +CONFIG_RETPOLINE=y CONFIG_RTC_CLASS=y CONFIG_RTC_MC146818_LIB=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y @@ -418,8 +419,6 @@ CONFIG_SG_POOL=y CONFIG_SPARSEMEM_STATIC=y CONFIG_SPARSE_IRQ=y CONFIG_SRCU=y -CONFIG_STRICT_KERNEL_RWX=y -CONFIG_STRICT_MODULE_RWX=y CONFIG_SWIOTLB=y CONFIG_SYSCTL_EXCEPTION_TRACE=y # CONFIG_TELCLOCK is not set @@ -432,8 +431,8 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y # CONFIG_TOSHIBA is not set -# CONFIG_UNWINDER_GUESS is not set CONFIG_UNWINDER_FRAME_POINTER=y +# CONFIG_UNWINDER_GUESS is not set CONFIG_UP_LATE_INIT=y CONFIG_USB=y CONFIG_USB_COMMON=y diff --git a/target/linux/x86/config-4.9 b/target/linux/x86/config-4.9 index 76366a7d71..9bc1d9f22c 100644 --- a/target/linux/x86/config-4.9 +++ b/target/linux/x86/config-4.9 @@ -40,6 +40,7 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y @@ -144,6 +145,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_IO=y @@ -272,7 +274,6 @@ CONFIG_JBD2=y CONFIG_KALLSYMS=y CONFIG_KEXEC=y CONFIG_KEXEC_CORE=y -# CONFIG_KEXEC_FILE is not set CONFIG_KEYBOARD_ATKBD=y # CONFIG_LEDS_CLEVO_MAIL is not set CONFIG_LIBNVDIMM=y @@ -366,6 +367,7 @@ CONFIG_PROC_PAGE_MONITOR=y # CONFIG_RCU_STALL_COMMON is not set CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y +CONFIG_RETPOLINE=y CONFIG_RTC_CLASS=y CONFIG_RTC_MC146818_LIB=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y -- 2.30.2