Merge branch 'linus' into sfi-release

Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 223af43f1526..feaeb0d3aa4f 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -22,6 +22,8 @@
 #include <asm/msr.h>
 #include <asm/apic.h>
 #include <linux/percpu.h>
+
+#include <asm/x86_init.h>
 #include <asm/reboot.h>
 
 #define KVM_SCALE 22
@@ -50,8 +52,8 @@ static unsigned long kvm_get_wallclock(void)
         struct timespec ts;
         int low, high;
 
-        low = (int)__pa(&wall_clock);
-        high = ((u64)__pa(&wall_clock) >> 32);
+        low = (int)__pa_symbol(&wall_clock);
+        high = ((u64)__pa_symbol(&wall_clock) >> 32);
         native_write_msr(MSR_KVM_WALL_CLOCK, low, high);
 
         vcpu_time = &get_cpu_var(hv_clock);
@@ -182,12 +184,13 @@ void __init kvmclock_init(void)
         if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) {
                 if (kvm_register_clock("boot clock"))
                         return;
-                pv_time_ops.get_wallclock = kvm_get_wallclock;
-                pv_time_ops.set_wallclock = kvm_set_wallclock;
                 pv_time_ops.sched_clock = kvm_clock_read;
-                pv_time_ops.get_tsc_khz = kvm_get_tsc_khz;
+                x86_platform.calibrate_tsc = kvm_get_tsc_khz;
+                x86_platform.get_wallclock = kvm_get_wallclock;
+                x86_platform.set_wallclock = kvm_set_wallclock;
 #ifdef CONFIG_X86_LOCAL_APIC
-                pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock;
+                x86_cpuinit.setup_percpu_clockev =
+                        kvm_setup_secondary_clock;
 #endif
 #ifdef CONFIG_SMP
                 smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;