6 files changed, 14 insertions, 14 deletions

diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index fe26ba3e3451..ad5bd988fb79 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -42,6 +42,7 @@
 #include <asm/time.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
+#include <asm/x86_init.h>
 
 #define EFI_DEBUG       1
 #define PFX             "EFI: "
@@ -453,6 +454,9 @@ void __init efi_init(void)
         if (add_efi_memmap)
                 do_add_efi_memmap();
 
+        x86_platform.get_wallclock = efi_get_time;
+        x86_platform.set_wallclock = efi_set_rtc_mmss;
+
         /* Setup for EFI runtime service */
         reboot_type = BOOT_EFI;
 
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 75a21b61b863..59ab94db12ea 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -184,10 +184,10 @@ 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;
                 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
                 x86_cpuinit.setup_percpu_clockev =
                         kvm_setup_secondary_clock;
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 7cbf898d839b..c0fb85aed432 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -306,8 +306,6 @@ struct pv_init_ops pv_init_ops = {
 };
 
 struct pv_time_ops pv_time_ops = {
-        .get_wallclock = native_get_wallclock,
-        .set_wallclock = native_set_wallclock,
         .sched_clock = native_sched_clock,
 };
 
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 5d465b207e72..b8652f2e6855 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -8,6 +8,7 @@
 #include <linux/pnp.h>
 
 #include <asm/vsyscall.h>
+#include <asm/x86_init.h>
 #include <asm/time.h>
 
 #ifdef CONFIG_X86_32
@@ -165,13 +166,13 @@ void rtc_cmos_write(unsigned char val, unsigned char addr)
 }
 EXPORT_SYMBOL(rtc_cmos_write);
 
-static int set_rtc_mmss(unsigned long nowtime)
+int update_persistent_clock(struct timespec now)
 {
         unsigned long flags;
         int retval;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        retval = set_wallclock(nowtime);
+        retval = x86_platform.set_wallclock(now.tv_sec);
         spin_unlock_irqrestore(&rtc_lock, flags);
 
         return retval;
@@ -183,17 +184,12 @@ unsigned long read_persistent_clock(void)
         unsigned long retval, flags;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        retval = get_wallclock();
+        retval = x86_platform.get_wallclock();
         spin_unlock_irqrestore(&rtc_lock, flags);
 
         return retval;
 }
 
-int update_persistent_clock(struct timespec now)
-{
-        return set_rtc_mmss(now.tv_sec);
-}
-
 unsigned long long native_read_tsc(void)
 {
         return __native_read_tsc();
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index 052ae81ee08b..31e6f6cfe53e 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -818,14 +818,14 @@ static inline int __init activate_vmi(void)
                 vmi_timer_ops.cancel_alarm =
                          vmi_get_function(VMI_CALL_CancelAlarm);
                 x86_init.timers.timer_init = vmi_time_init;
-                pv_time_ops.get_wallclock = vmi_get_wallclock;
-                pv_time_ops.set_wallclock = vmi_set_wallclock;
 #ifdef CONFIG_X86_LOCAL_APIC
                 x86_init.timers.setup_percpu_clockev = vmi_time_bsp_init;
                 x86_cpuinit.setup_percpu_clockev = vmi_time_ap_init;
 #endif
                 pv_time_ops.sched_clock = vmi_sched_clock;
                 x86_platform.calibrate_tsc = vmi_tsc_khz;
+                x86_platform.get_wallclock = vmi_get_wallclock;
+                x86_platform.set_wallclock = vmi_set_wallclock;
 
                 /* We have true wallclock functions; disable CMOS clock sync */
                 no_sync_cmos_clock = 1;
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 68824c7be4e2..4449a4a2c2ed 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -70,4 +70,6 @@ struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
 
 struct x86_platform_ops x86_platform = {
         .calibrate_tsc                  = native_calibrate_tsc,
+        .get_wallclock                  = mach_get_cmos_time,
+        .set_wallclock                  = mach_set_rtc_mmss,
 };