diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:16:33 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:16:33 +0200 |
| commit | 472475000979a156bc32cd75caa59737f5a1caa5 (patch) | |
| tree | 6a98319244f7954237cf866c8862ffe3f6128d2d /include/linux/set_memory.h | |
| parent | 712fca63f50a87780ca6dc105370557a945a7ee8 (diff) | |
| parent | 9d7b18668956c411a422d04c712994c5fdb23a4b (diff) | |
Merge branch 'for-4.20/apple' into for-linus
Support for Apple Magic Trackpad 2
Diffstat (limited to 'include/linux/set_memory.h')
| -rw-r--r-- | include/linux/set_memory.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h index da5178216da5..2a986d282a97 100644 --- a/include/linux/set_memory.h +++ b/include/linux/set_memory.h @@ -17,6 +17,20 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; } static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; } #endif +#ifndef set_mce_nospec +static inline int set_mce_nospec(unsigned long pfn) +{ + return 0; +} +#endif + +#ifndef clear_mce_nospec +static inline int clear_mce_nospec(unsigned long pfn) +{ + return 0; +} +#endif + #ifndef CONFIG_ARCH_HAS_MEM_ENCRYPT static inline int set_memory_encrypted(unsigned long addr, int numpages) { |