diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-20 22:44:40 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-20 22:46:34 +0100 |
| commit | e390756effa8341b3b3c7c44b339b8bfcf610b68 (patch) | |
| tree | 53bfc46115ea6962c36f7f89f0545a7a88e20974 /target/linux/x86/config-4.9 | |
| parent | 4336efe14b61e47177a2d0863f8391c48cf4a9f5 (diff) | |
| download | upstream-e390756effa8341b3b3c7c44b339b8bfcf610b68.tar.gz upstream-e390756effa8341b3b3c7c44b339b8bfcf610b68.tar.bz2 upstream-e390756effa8341b3b3c7c44b339b8bfcf610b68.zip | |
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 <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/x86/config-4.9')
| -rw-r--r-- | target/linux/x86/config-4.9 | 4 |
1 files changed, 3 insertions, 1 deletions
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 |