Index: kernel/arch/amd64/include/cpuid.h
===================================================================
--- kernel/arch/amd64/include/cpuid.h	(revision d0485c6a1e50e0398bb04d70d1e1ed89ea3db22a)
+++ kernel/arch/amd64/include/cpuid.h	(revision 34db7fa828e4d10ee2a902fb4143704b3feda184)
@@ -58,7 +58,4 @@
 extern void cpuid(uint32_t cmd, cpu_info_t *info);
 
-
-extern uint64_t rdtsc(void);
-
 #endif /* !def __ASM__ */
 #endif
Index: kernel/arch/amd64/include/cycle.h
===================================================================
--- kernel/arch/amd64/include/cycle.h	(revision 34db7fa828e4d10ee2a902fb4143704b3feda184)
+++ kernel/arch/amd64/include/cycle.h	(revision 34db7fa828e4d10ee2a902fb4143704b3feda184)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup amd64
+ * @{
+ */
+/** @file
+ */
+
+#ifndef KERN_amd64_CYCLE_H_
+#define KERN_amd64_CYCLE_H_
+
+extern uint64_t get_cycle(void);
+
+#endif
+
+/** @}
+ */
Index: kernel/arch/amd64/src/asm_utils.S
===================================================================
--- kernel/arch/amd64/src/asm_utils.S	(revision d0485c6a1e50e0398bb04d70d1e1ed89ea3db22a)
+++ kernel/arch/amd64/src/asm_utils.S	(revision 34db7fa828e4d10ee2a902fb4143704b3feda184)
@@ -63,5 +63,5 @@
 .global cpuid
 .global has_cpuid
-.global rdtsc
+.global get_cycle
 .global read_efer_flag
 .global set_efer_flag
@@ -147,5 +147,5 @@
 	ret
 
-rdtsc:
+get_cycle:
 	xorq %rax,%rax
 	rdtsc