Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2018-10-04 11:36:44 +0200
committerJan Kara <jack@suse.cz>2018-10-04 11:36:44 +0200
commitfaef7958c539035f83d7e7ef5fdbc5e9ecedc0f8 (patch)
tree6d04b193b5b9af49d23aa567931adbf92c1700d7
parente266792072847defe2fb2195139c22ce23857e90 (diff)
patches.fixes/x86-memory_failure-Introduce-set-clear-_mce_nospec.patch:rpm-4.12.14-25.22--sle15-updatesrpm-4.12.14-25.22
Fixup compilation breakage on s390 and arm due to missing clear_mce_nospec().
-rw-r--r--patches.fixes/x86-memory_failure-Introduce-set-clear-_mce_nospec.patch24
1 files changed, 23 insertions, 1 deletions
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 57939b93a6..45f15180f6 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 <dave.jiang@intel.com>
Acked-by: Jan Kara <jack@suse.cz>
---
+ 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;