git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[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
07340ae
..
7554458
100644
(file)
--- a/
arch/x86_64/kernel/pmtimer.c
+++ b/
arch/x86_64/kernel/pmtimer.c
@@
-27,7
+27,7
@@
/* The I/O port the PMTMR resides at.
* The location is detected during setup_arch(),
* in arch/i386/kernel/acpi/boot.c */
/* The I/O port the PMTMR resides at.
* The location is detected during setup_arch(),
* in arch/i386/kernel/acpi/boot.c */
-u32 pmtmr_ioport;
+u32 pmtmr_ioport
__read_mostly
;
/* value of the Power timer at last timer interrupt */
static u32 offset_delay;
/* value of the Power timer at last timer interrupt */
static u32 offset_delay;
@@
-60,9
+60,7
@@
int pmtimer_mark_offset(void)
delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK);
last_pmtmr_tick = tick;
delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK);
last_pmtmr_tick = tick;
-#ifndef CONFIG_XEN
monotonic_base += delta * NSEC_PER_USEC;
monotonic_base += delta * NSEC_PER_USEC;
-#endif
delta += offset_delay;
delta += offset_delay;