diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 16:13:49 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 16:13:49 -0500 |
| commit | 0518469d0a32be1e6dd8850ff274d52d72cdb52d (patch) | |
| tree | c13038d099e04208feae565947783cf92ceae9ee /arch/x86/kernel/tsc.c | |
| parent | 28a00184be261e3dc152ba0d664a067bbe235b6a (diff) | |
| parent | f5a54dd7952e9032785cd1ef0dde72cd61025341 (diff) | |
Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index eee465109e16..2c9cf0fd78f5 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -178,11 +178,11 @@ static unsigned long calc_pmtimer_ref(u64 deltatsc, u64 pm1, u64 pm2) | |||
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | #define CAL_MS 10 | 180 | #define CAL_MS 10 |
| 181 | #define CAL_LATCH (CLOCK_TICK_RATE / (1000 / CAL_MS)) | 181 | #define CAL_LATCH (PIT_TICK_RATE / (1000 / CAL_MS)) |
| 182 | #define CAL_PIT_LOOPS 1000 | 182 | #define CAL_PIT_LOOPS 1000 |
| 183 | 183 | ||
| 184 | #define CAL2_MS 50 | 184 | #define CAL2_MS 50 |
| 185 | #define CAL2_LATCH (CLOCK_TICK_RATE / (1000 / CAL2_MS)) | 185 | #define CAL2_LATCH (PIT_TICK_RATE / (1000 / CAL2_MS)) |
| 186 | #define CAL2_PIT_LOOPS 5000 | 186 | #define CAL2_PIT_LOOPS 5000 |
| 187 | 187 | ||
| 188 | 188 | ||