From a4bcc5c112ecf61d2d7a4cc8a091d5329c80f4b3 Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 30 Jan 2008 13:31:26 +0100
Subject: [PATCH] --- yaml --- r: 80027 b: refs/heads/master c:
 73018a66e70fa631935192e5ed6ef8fa2d20b22d h: refs/heads/master i:   80025:
 d9a89b5219b590450c0c02802b982bf32118427a   80023:
 ff2f30695183742b88ab843d9b4a29b225e35b27 v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-x86/processor_32.h | 5 -----
 trunk/include/asm-x86/tsc.h          | 4 ++++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f15064fc67b5..978a5f6169bf 100644
--- 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
index a5560a3b57ef..76cada930d22 100644
--- 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
index 9b7d264897fa..401303724130 100644
--- 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)
 {