projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b774397
)
time: x86: Remove CLOCK_TICK_RATE from mach_timer.h
author
Deepak Saxena
<dsaxena@linaro.org>
Tue, 1 Nov 2011 21:25:16 +0000
(14:25 -0700)
committer
John Stultz
<john.stultz@linaro.org>
Tue, 22 Nov 2011 03:00:57 +0000
(19:00 -0800)
CLOCK_TICK_RATE is defined as PIT_TICK_RATE on x86 so we
update mach_timers.h to just use the later as we want
to depecrate CLOCK_TICK_RATE.
Signed-off-by: Deepak Saxena <dsaxena@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
arch/x86/include/asm/mach_timer.h
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/include/asm/mach_timer.h
b/arch/x86/include/asm/mach_timer.h
index 853728519ae9b928bf113ead296d50c04388a737..88d0c3c74c1326706707b0fa78dcd5ef8f654eee 100644
(file)
--- a/
arch/x86/include/asm/mach_timer.h
+++ b/
arch/x86/include/asm/mach_timer.h
@@
-15,7
+15,7
@@
#define CALIBRATE_TIME_MSEC 30 /* 30 msecs */
#define CALIBRATE_LATCH \
- ((
CLOCK
_TICK_RATE * CALIBRATE_TIME_MSEC + 1000/2)/1000)
+ ((
PIT
_TICK_RATE * CALIBRATE_TIME_MSEC + 1000/2)/1000)
static inline void mach_prepare_counter(void)
{