diff options
| author | john stultz <johnstul@us.ibm.com> | 2007-02-16 01:28:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:14:00 -0800 |
| commit | 1489939f0ab64b96998e04068c516c39afe29654 (patch) | |
| tree | 6bb3ca772edf1dd8877482dc3b6bcc6f0d699e72 /include/asm-x86_64 | |
| parent | c37e7bb5d2ce36ef377caabfced0b132bb1bf6a7 (diff) | |
[PATCH] time: x86_64: convert x86_64 to use GENERIC_TIME
This patch converts x86_64 to use the GENERIC_TIME infrastructure and adds
clocksource structures for both TSC and HPET (ACPI PM is shared w/ i386).
[akpm@osdl.org: fix printk timestamps]
[akpm@osdl.org: fix printk ckeanups]
[akpm@osdl.org: hpet build fix]
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')
| -rw-r--r-- | include/asm-x86_64/proto.h | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/timex.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 2ce3adf7bfd..f590ae088f0 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h @@ -45,11 +45,9 @@ extern u32 pmtmr_ioport; #else #define pmtmr_ioport 0 #endif -extern unsigned long long monotonic_base; extern int sysctl_vsyscall; extern int nohpet; extern unsigned long vxtime_hz; -extern void time_init_gtod(void); extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2))); diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h index a0174757aee..beb6d9014a6 100644 --- a/include/asm-x86_64/timex.h +++ b/include/asm-x86_64/timex.h @@ -28,9 +28,6 @@ extern int read_current_timer(unsigned long *timer_value); #define US_SCALE 32 /* 2^32, arbitralrily chosen */ extern struct vxtime_data vxtime; - -extern unsigned int do_gettimeoffset_hpet(void); -extern unsigned int do_gettimeoffset_tsc(void); +extern void mark_tsc_unstable(void); extern void set_cyc2ns_scale(unsigned long khz); -extern int notsc; #endif |