Timecounters for amd64. Diff by art@, tested by many. ok deraadt@

2 files changed, 6 insertions, 11 deletions

diff --git a/sys/arch/amd64/include/_types.h b/sys/arch/amd64/include/_types.h
index 259b7405e94..b399e2d6f61 100644
--- a/sys/arch/amd64/include/_types.h
+++ b/sys/arch/amd64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:08 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2006/11/07 09:09:42 otto Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -118,5 +118,6 @@ typedef	void *			__wctype_t;
 #define __HAVE_GENERIC_SOFT_INTERRUPTS
 #define __HAVE_CPUINFO
 #define __HAVE_MUTEX
+#define __HAVE_TIMECOUNTER
 
 #endif	/* _AMD64__TYPES_H_ */
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 372a26d080c..5d587c39f1f 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.18 2006/03/08 03:33:21 uwe Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.19 2006/11/07 09:09:42 otto Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -230,11 +230,9 @@ extern u_int32_t cpus_attached;
  */
 extern void (*delay_func)(int);
 struct timeval;
-extern void (*microtime_func)(struct timeval *);
 
 #define DELAY(x)		(*delay_func)(x)
 #define delay(x)		(*delay_func)(x)
-#define microtime(tv)		(*microtime_func)(tv)
 
 
 /*
@@ -251,12 +249,6 @@ extern int cpu_id;
 extern char cpu_vendor[];
 extern int cpuid_level;
 
-/* kern_microtime.c */
-
-extern struct timeval cc_microset_time;
-void	cc_microtime(struct timeval *);
-void	cc_microset(struct cpu_info *);
-
 /* identcpu.c */
 
 void	identifycpu(struct cpu_info *);
@@ -286,8 +278,10 @@ void	child_trampoline(void);
 void	initrtclock(void);
 void	startrtclock(void);
 void	i8254_delay(int);
-void	i8254_microtime(struct timeval *);
 void	i8254_initclocks(void);
+void	i8254_inittimecounter(void);
+void	i8254_inittimecounter_simple(void);
+
 
 void cpu_init_msrs(struct cpu_info *);