---

yaml --- r: 80027 b: refs/heads/master c: 73018a6 h: refs/heads/master i: 80025: d9a89b5 80023: ff2f306 v: v3
git-mirror · Jan 30, 2008 · a4bcc5c · a4bcc5c
1 parent 48c5b60
commit a4bcc5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bcbc78dea92fdf0947fa48e248da3c993a5690f
+refs/heads/master: 73018a66e70fa631935192e5ed6ef8fa2d20b22d
diff --git a/trunk/include/asm-x86/processor_32.h b/trunk/include/asm-x86/processor_32.h
@@ -22,9 +22,6 @@
 #include <asm/processor-flags.h>
 #include <asm/desc_defs.h>
 
-/* flag for disabling the tsc */
-extern int tsc_disable;
-
 static inline int desc_empty(const void *ptr)
 {
 	const u32 *desc = ptr;
@@ -206,8 +203,6 @@ extern int bootloader_type;
 
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 
-extern void disable_TSC(void);
-
 /*
  * Size of io_bitmap.
  */

diff --git a/trunk/include/asm-x86/tsc.h b/trunk/include/asm-x86/tsc.h
@@ -16,6 +16,10 @@ typedef unsigned long long cycles_t;
 
 extern unsigned int cpu_khz;
 extern unsigned int tsc_khz;
+/* flag for disabling the tsc */
+extern int tsc_disable;
+
+extern void disable_TSC(void);
 
 static inline cycles_t get_cycles(void)
 {