diff options
| author | john stultz <johnstul@us.ibm.com> | 2007-02-16 04:28:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:14:00 -0500 |
| commit | 7460ed2844ffad7141e30271c0c3da8336e66014 (patch) | |
| tree | 4ae7f2ebf09b59f214d243d0f886fb2c4e7915e8 /include/asm-x86_64/timex.h | |
| parent | 1489939f0ab64b96998e04068c516c39afe29654 (diff) | |
[PATCH] time: x86_64: re-enable vsyscall support for x86_64
Cleanup and re-enable vsyscall gettimeofday using the generic clocksource
infrastructure.
[akpm@osdl.org: cleanup]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86_64/timex.h')
| -rw-r--r-- | include/asm-x86_64/timex.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h index beb6d9014a63..8c6808a3fba4 100644 --- a/include/asm-x86_64/timex.h +++ b/include/asm-x86_64/timex.h | |||
| @@ -27,7 +27,6 @@ extern int read_current_timer(unsigned long *timer_value); | |||
| 27 | #define NS_SCALE 10 /* 2^10, carefully chosen */ | 27 | #define NS_SCALE 10 /* 2^10, carefully chosen */ |
| 28 | #define US_SCALE 32 /* 2^32, arbitralrily chosen */ | 28 | #define US_SCALE 32 /* 2^32, arbitralrily chosen */ |
| 29 | 29 | ||
| 30 | extern struct vxtime_data vxtime; | ||
| 31 | extern void mark_tsc_unstable(void); | 30 | extern void mark_tsc_unstable(void); |
| 32 | extern void set_cyc2ns_scale(unsigned long khz); | 31 | extern void set_cyc2ns_scale(unsigned long khz); |
| 33 | #endif | 32 | #endif |