aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/timex.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-12 23:04:23 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-12 23:04:23 +0200
commit2f0798a3b1c2155b8f30858e853557aef9da2e4e (patch)
treea7a8c08d84dea9bef33e02eeccd499a6e8f6fc75 /include/asm-x86/timex.h
parent5d5a2989b72847e1f5763420ea31383ca63ebf53 (diff)
downloadmrst-s0i3-test-2f0798a3b1c2155b8f30858e853557aef9da2e4e.tar.gz
mrst-s0i3-test-2f0798a3b1c2155b8f30858e853557aef9da2e4e.tar.xz
mrst-s0i3-test-2f0798a3b1c2155b8f30858e853557aef9da2e4e.zip
x86: unify timex.h variants
Combine the timex.h variants and move the TSC related code into tsc.h. Move the set_cyc2ns_scale() call into the tsc calibraction code, where it belongs. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'include/asm-x86/timex.h')
-rw-r--r--include/asm-x86/timex.h19
1 files changed, 16 insertions, 3 deletions
diff --git a/include/asm-x86/timex.h b/include/asm-x86/timex.h
index d01c18cfcce..39a21ab030f 100644
--- a/include/asm-x86/timex.h
+++ b/include/asm-x86/timex.h
@@ -1,5 +1,18 @@
-#ifdef CONFIG_X86_32
-# include "timex_32.h"
+/* x86 architecture timex specifications */
+#ifndef _ASM_X86_TIMEX_H
+#define _ASM_X86_TIMEX_H
+
+#include <asm/processor.h>
+#include <asm/tsc.h>
+
+#ifdef CONFIG_X86_ELAN
+# define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */
#else
-# include "timex_64.h"
+# define PIT_TICK_RATE 1193182 /* Underlying HZ */
+#endif
+#define CLOCK_TICK_RATE PIT_TICK_RATE
+
+extern int read_current_timer(unsigned long *timer_value);
+#define ARCH_HAS_READ_CURRENT_TIMER 1
+
#endif