diff options
| author | Juerg Haefliger <juerg.haefliger@canonical.com> | 2018-01-17 17:22:04 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-02-13 18:42:34 +0000 |
| commit | 957a3d249cb16292a199f73b7138d23ee44ca433 (patch) | |
| tree | db80dbc0d7cdee2ed1cc5067d41b29ecd89da96c | |
| parent | 9f1cf17b701702325fbdd505325562cb79e6d429 (diff) | |
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>
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 5 | ||||
| -rw-r--r-- | arch/x86/mm/kaiser.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index b0b1504ffec9..e8bb0044f90c 100644 --- 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 8d1019d176e2..8b5939649088 100644 --- 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; |