diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-12 23:04:23 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-12 23:04:23 +0200 |
| commit | 2f0798a3b1c2155b8f30858e853557aef9da2e4e (patch) | |
| tree | a7a8c08d84dea9bef33e02eeccd499a6e8f6fc75 /include/asm-x86/tsc.h | |
| parent | 5d5a2989b72847e1f5763420ea31383ca63ebf53 (diff) | |
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/tsc.h')
| -rw-r--r-- | include/asm-x86/tsc.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h index 2002f8d6d20..6baab30dc2c 100644 --- a/include/asm-x86/tsc.h +++ b/include/asm-x86/tsc.h @@ -1,13 +1,14 @@ /* - * linux/include/asm-i386/tsc.h - * - * i386 TSC related functions + * x86 TSC related functions */ -#ifndef _ASM_i386_TSC_H -#define _ASM_i386_TSC_H +#ifndef _ASM_X86_TSC_H +#define _ASM_X86_TSC_H #include <asm/processor.h> +#define NS_SCALE 10 /* 2^10, carefully chosen */ +#define US_SCALE 32 /* 2^32, arbitralrily chosen */ + /* * Standard way to access the cycle counter. */ |