diff options
| author | Alok Kataria <akataria@vmware.com> | 2008-07-01 11:43:34 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 07:43:27 +0200 |
| commit | 8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 (patch) | |
| tree | 3b7c8e4ee74ef5fec07f64ea56bff60afb433c2c /include/asm-x86/delay.h | |
| parent | 2dbe06faf37b39f9ecffc054dd173b2a1dc2adcd (diff) | |
x86: merge tsc_init and clocksource code
Unify the clocksource code.
Unify the tsc_init code.
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Dan Hecht <dhecht@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/delay.h')
| -rw-r--r-- | include/asm-x86/delay.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/delay.h b/include/asm-x86/delay.h index 409a649204a..bb80880c834 100644 --- a/include/asm-x86/delay.h +++ b/include/asm-x86/delay.h @@ -26,6 +26,10 @@ extern void __delay(unsigned long loops); ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \ __ndelay(n)) +#ifdef CONFIG_X86_32 void use_tsc_delay(void); +#else +#define use_tsc_delay() {} +#endif #endif /* _ASM_X86_DELAY_H */ |