diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 16:57:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 16:57:44 -0500 |
| commit | 376613e81ddc68f545fd5c87ffc3ad222b7abe5f (patch) | |
| tree | e1cb1cd43d05f57e4584dd5f9ce3eb965d0ddff1 /drivers/clocksource/acpi_pm.c | |
| parent | 0db49b72bce26341274b74fd968501489a361ae3 (diff) | |
| parent | 0518469d0a32be1e6dd8850ff274d52d72cdb52d (diff) | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, tsc: Skip TSC synchronization checks for tsc=reliable
clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz
clocksource: cris: Convert to clocksource_register_khz
clocksource: xtensa: Convert to clocksource_register_hz/khz
clocksource: um: Convert to clocksource_register_hz/khz
clocksource: parisc: Convert to clocksource_register_hz/khz
clocksource: m86k: Convert to clocksource_register_hz/khz
time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver
time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
time: x86: Remove CLOCK_TICK_RATE from mach_timer.h
time: x86: Remove CLOCK_TICK_RATE from tsc code
time: Fix spelling mistakes in new comments
time: fix bogus comment in timekeeping_get_ns_raw
Diffstat (limited to 'drivers/clocksource/acpi_pm.c')
| -rw-r--r-- | drivers/clocksource/acpi_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index effe7974aa9..6b5cf02c35c 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
| @@ -143,7 +143,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE, | |||
| 143 | #ifndef CONFIG_X86_64 | 143 | #ifndef CONFIG_X86_64 |
| 144 | #include <asm/mach_timer.h> | 144 | #include <asm/mach_timer.h> |
| 145 | #define PMTMR_EXPECTED_RATE \ | 145 | #define PMTMR_EXPECTED_RATE \ |
| 146 | ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) | 146 | ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (PIT_TICK_RATE>>10)) |
| 147 | /* | 147 | /* |
| 148 | * Some boards have the PMTMR running way too fast. We check | 148 | * Some boards have the PMTMR running way too fast. We check |
| 149 | * the PMTMR rate against PIT channel 2 to catch these cases. | 149 | * the PMTMR rate against PIT channel 2 to catch these cases. |