aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-01-30 13:31:26 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:31:26 +0100
commit73018a66e70fa631935192e5ed6ef8fa2d20b22d (patch)
tree30282f41876ad55cc1e92f4def1afe7e09f1cc76 /include/asm-x86
parent7bcbc78dea92fdf0947fa48e248da3c993a5690f (diff)
x86: move tsc definitions to were they belong
This patch wipes out the definitions of tsc_disable from processor_32.h and move it to tsc.h, were it belongs Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/processor_32.h5
-rw-r--r--include/asm-x86/tsc.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index a5560a3b57e..76cada930d2 100644
--- a/include/asm-x86/processor_32.h
+++ b/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/include/asm-x86/tsc.h b/include/asm-x86/tsc.h
index 9b7d264897f..40130372413 100644
--- a/include/asm-x86/tsc.h
+++ b/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)
{