x86/kaiser: Rename and simplify X86_FEATURE_KAISER handling

[pandora-kernel.git] / arch / x86 / mm / kaiser.c

diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c
index bef8a41..5d0be21 100644 (file)
--- a/arch/x86/mm/kaiser.c
+++ b/arch/x86/mm/kaiser.c
@@ -275,8 +275,13 @@ void __init kaiser_init(void)
 {
        int cpu;
 
-       if (!kaiser_enabled)
+       if (!kaiser_enabled) {
+               setup_clear_cpu_cap(X86_FEATURE_KAISER);
                return;
+       }
+
+       setup_force_cpu_cap(X86_FEATURE_KAISER);
+
        kaiser_init_all_pgds();
 
        for_each_possible_cpu(cpu) {
@@ -408,3 +413,16 @@ void kaiser_flush_tlb_on_return_to_user(void)
                        X86_CR3_PCID_USER_FLUSH | KAISER_SHADOW_PGD_OFFSET);
 }
 EXPORT_SYMBOL(kaiser_flush_tlb_on_return_to_user);
+
+static int __init x86_nokaiser_setup(char *s)
+{
+       /* nopti doesn't accept parameters */
+       if (s)
+               return -EINVAL;
+
+       kaiser_enabled = 0;
+       pr_info("Kernel/User page tables isolation: disabled\n");
+
+       return 0;
+}
+early_param("nopti", x86_nokaiser_setup);