From 1489939f0ab64b96998e04068c516c39afe29654 Mon Sep 17 00:00:00 2001 From: john stultz Date: Fri, 16 Feb 2007 01:28:20 -0800 Subject: [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 Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Andi Kleen Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-x86_64/timex.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/asm-x86_64/timex.h') diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h index a0174757aee2..beb6d9014a63 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 -- cgit v1.2.2