Home| summaryrefslogtreecommitdiff |
diff options
| author | Jan Kara <jack@suse.cz> | 2018-10-04 11:36:44 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2018-10-04 11:36:44 +0200 |
| commit | cb24c8f0a78a31b1971cc8bee24547f357e672b3 (patch) | |
| tree | 9379a8ffe93c073d7c54c65b958c63ca900dfdc5 | |
| parent | 8df7004dc3d0e86ba1214f2501b137546e789e85 (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().
suse-commit: faef7958c539035f83d7e7ef5fdbc5e9ecedc0f8
| -rw-r--r-- | arch/arm/include/asm/set_memory.h | 3 | ||||
| -rw-r--r-- | arch/s390/include/asm/set_memory.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/include/asm/set_memory.h b/arch/arm/include/asm/set_memory.h index 5aa4315abe91..4fb9cd5307c8 100644 --- 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(void) { } static inline void set_kernel_text_ro(void) { } #endif +#define set_mce_nospec(pfn) (0) +#define clear_mce_nospec(pfn) (0) + #endif diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set_memory.h index 46a4db44c47a..fbb6021a9c4a 100644 --- 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 long addr, int numpages) return __set_memory(addr, numpages, SET_MEMORY_X); } +#define set_mce_nospec(pfn) (0) +#define clear_mce_nospec(pfn) (0) + #endif |