Revert "x86: kvmclock: Disable use from vDSO if KPTI is enabled"

This reverts commit abe3029e4febfa18e4a9562a792465182b3992a0.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index b0b1504ffec9a0abbf1e4c5007a3ed56412ea332..e8bb0044f90cac9fe4829105cec610ad1d73fa1f 100644 (file)
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -24,7 +24,6 @@
 #include <linux/percpu.h>
 #include <linux/hardirq.h>
 #include <linux/memblock.h>
-#include <linux/kaiser.h>
 
 #include <asm/x86_init.h>
 #include <asm/reboot.h>
@@ -287,10 +286,6 @@ int __init kvm_setup_vsyscall_timeinfo(void)
        if (!hv_clock)
                return 0;
 
-       /* FIXME: Need to add pvclock pages to user-space page tables */
-       if (kaiser_enabled)
-               return 0;
-
        size = PAGE_ALIGN(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
 
        preempt_disable();

diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c
index 8d1019d176e260c821547f53dd1b41560c796348..8b59396490886d5863c309d5cbe6e9025b02f772 100644 (file)
--- a/arch/x86/mm/kaiser.c
+++ b/arch/x86/mm/kaiser.c
@@ -322,7 +322,7 @@ silent_disable:
  */
 void __init kaiser_init(void)
 {
-       int cpu, idx;
+       int cpu;
 
        if (!kaiser_enabled)
                return;