From: Dave Hansen <[email protected]> Currently, all of the checks for KAISER are compile-time checks.
Runtime checks are needed for turning it on/off at runtime. Add a function to do that. Signed-off-by: Dave Hansen <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Daniel Gruss <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Kees Cook <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Michael Schwarz <[email protected]> Cc: Moritz Lipp <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Richard Fellner <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- arch/x86/include/asm/kaiser.h | 5 +++++ include/linux/kaiser.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/arch/x86/include/asm/kaiser.h b/arch/x86/include/asm/kaiser.h index 040cb096d29d..35f12a8a7071 100644 --- a/arch/x86/include/asm/kaiser.h +++ b/arch/x86/include/asm/kaiser.h @@ -56,6 +56,11 @@ extern void kaiser_remove_mapping(unsigned long start, unsigned long size); */ extern void kaiser_init(void); +static inline bool kaiser_active(void) +{ + extern int kaiser_enabled; + return kaiser_enabled; +} #endif #endif /* __ASSEMBLY__ */ diff --git a/include/linux/kaiser.h b/include/linux/kaiser.h index 77db4230a0dd..a3d28d00d555 100644 --- a/include/linux/kaiser.h +++ b/include/linux/kaiser.h @@ -28,5 +28,10 @@ static inline int kaiser_add_mapping(unsigned long addr, unsigned long size, static inline void kaiser_add_mapping_cpu_entry(int cpu) { } + +static inline bool kaiser_active(void) +{ + return 0; +} #endif /* !CONFIG_KAISER */ #endif /* _INCLUDE_KAISER_H */ -- 2.14.1
