3.16.54-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Juerg Haefliger <juerg.haefliger@xxxxxxxxxxxxx>
This reverts commit abe3029e4febfa18e4a9562a792465182b3992a0.
Signed-off-by: Juerg Haefliger <juerg.haefliger@xxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
arch/x86/kernel/kvmclock.c | 5 -----
arch/x86/mm/kaiser.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
--- 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(v
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();
--- 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;