From faef7958c539035f83d7e7ef5fdbc5e9ecedc0f8 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Oct 04 2018 09:36:44 +0000 Subject: patches.fixes/x86-memory_failure-Introduce-set-clear-_mce_nospec.patch: Fixup compilation breakage on s390 and arm due to missing clear_mce_nospec(). --- diff --git a/patches.fixes/x86-memory_failure-Introduce-set-clear-_mce_nospec.patch b/patches.fixes/x86-memory_failure-Introduce-set-clear-_mce_nospec.patch index 57939b9..45f1518 100644 --- a/patches.fixes/x86-memory_failure-Introduce-set-clear-_mce_nospec.patch +++ b/patches.fixes/x86-memory_failure-Introduce-set-clear-_mce_nospec.patch @@ -35,12 +35,34 @@ Signed-off-by: Dave Jiang Acked-by: Jan Kara --- + arch/arm/include/asm/set_memory.h | 3 + + arch/s390/include/asm/set_memory.h | 3 + arch/x86/include/asm/set_memory.h | 44 +++++++++++++++++++++++++++ arch/x86/kernel/cpu/mcheck/mce-internal.h | 15 --------- arch/x86/kernel/cpu/mcheck/mce.c | 48 +----------------------------- include/asm-generic/set_memory.h | 4 ++ - 4 files changed, 50 insertions(+), 61 deletions(-) + 6 files changed, 56 insertions(+), 61 deletions(-) +--- a/arch/arm/include/asm/set_memory.h ++++ b/arch/arm/include/asm/set_memory.h +@@ -29,4 +29,7 @@ static inline void set_kernel_text_rw(vo + static inline void set_kernel_text_ro(void) { } + #endif + ++#define set_mce_nospec(pfn) (0) ++#define clear_mce_nospec(pfn) (0) ++ + #endif +--- a/arch/s390/include/asm/set_memory.h ++++ b/arch/s390/include/asm/set_memory.h +@@ -28,4 +28,7 @@ static inline int set_memory_x(unsigned + return __set_memory(addr, numpages, SET_MEMORY_X); + } + ++#define set_mce_nospec(pfn) (0) ++#define clear_mce_nospec(pfn) (0) ++ + #endif --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -87,4 +87,48 @@ extern int kernel_set_to_readonly;