Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / arch / x86_64 / kernel / pmtimer.c

diff --git a/arch/x86_64/kernel/pmtimer.c b/arch/x86_64/kernel/pmtimer.c
index bf421ed..07340ae 100644 (file)
--- a/arch/x86_64/kernel/pmtimer.c
+++ b/arch/x86_64/kernel/pmtimer.c
@@ -60,7 +60,9 @@ int pmtimer_mark_offset(void)
        delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK);
 
        last_pmtmr_tick = tick;
+#ifndef CONFIG_XEN
        monotonic_base += delta * NSEC_PER_USEC;
+#endif
 
        delta += offset_delay;