diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/asm-x86_64/timex.h | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/timex.h')
| -rw-r--r-- | include/asm-x86_64/timex.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h index 34f31a18f90b..24ecf6a637cb 100644 --- a/include/asm-x86_64/timex.h +++ b/include/asm-x86_64/timex.h | |||
| @@ -26,6 +26,9 @@ static inline cycles_t get_cycles (void) | |||
| 26 | 26 | ||
| 27 | extern unsigned int cpu_khz; | 27 | extern unsigned int cpu_khz; |
| 28 | 28 | ||
| 29 | extern int read_current_timer(unsigned long *timer_value); | ||
| 30 | #define ARCH_HAS_READ_CURRENT_TIMER 1 | ||
| 31 | |||
| 29 | extern struct vxtime_data vxtime; | 32 | extern struct vxtime_data vxtime; |
| 30 | 33 | ||
| 31 | #endif | 34 | #endif |