diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-06-08 20:11:27 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-06-08 20:11:27 +0300 |
| commit | 6e2b347d42e54282e4c6cfa08272db462b178f7f (patch) | |
| tree | 7686345b2e24c406a57feffcad558484f9552366 /include/linux/set_memory.h | |
| parent | e54a4424925a27ed94dff046db3ce5caf4b1e748 (diff) | |
| parent | f2906aa863381afb0015a9eb7fefad885d4e5a56 (diff) | |
| download | linux-6e2b347d42e54282e4c6cfa08272db462b178f7f.tar.xz | |
Merge v5.19-rc1 into drm-misc-fixes
Let's kick-off the start of the 5.19 fix cycle
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/linux/set_memory.h')
| -rw-r--r-- | include/linux/set_memory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h index f36be5166c19..369769ce7399 100644 --- a/include/linux/set_memory.h +++ b/include/linux/set_memory.h @@ -42,14 +42,14 @@ static inline bool can_set_direct_map(void) #endif #endif /* CONFIG_ARCH_HAS_SET_DIRECT_MAP */ -#ifndef set_mce_nospec -static inline int set_mce_nospec(unsigned long pfn, bool unmap) +#ifdef CONFIG_X86_64 +int set_mce_nospec(unsigned long pfn); +int clear_mce_nospec(unsigned long pfn); +#else +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; |