diff options
-rw-r--r-- | include/asm-x86/processor_32.h | 5 | ||||
-rw-r--r-- | include/asm-x86/tsc.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h index a5560a3b57ef..76cada930d22 100644 --- a/include/asm-x86/processor_32.h +++ b/include/asm-x86/processor_32.h | |||
@@ -22,9 +22,6 @@ | |||
22 | #include <asm/processor-flags.h> | 22 | #include <asm/processor-flags.h> |
23 | #include <asm/desc_defs.h> | 23 | #include <asm/desc_defs.h> |
24 | 24 | ||
25 | /* flag for disabling the tsc */ | ||
26 | extern int tsc_disable; | ||
27 | |||
28 | static inline int desc_empty(const void *ptr) | 25 | static inline int desc_empty(const void *ptr) |
29 | { | 26 | { |
30 | const u32 *desc = ptr; | 27 | const u32 *desc = ptr; |
@@ -206,8 +203,6 @@ extern int bootloader_type; | |||
206 | 203 | ||
207 | #define HAVE_ARCH_PICK_MMAP_LAYOUT | 204 | #define HAVE_ARCH_PICK_MMAP_LAYOUT |
208 | 205 | ||
209 | extern void disable_TSC(void); | ||
210 | |||
211 | /* | 206 | /* |
212 | * Size of io_bitmap. | 207 | * Size of io_bitmap. |
213 | */ | 208 | */ |
diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h index 9b7d264897fa..401303724130 100644 --- a/include/asm-x86/tsc.h +++ b/include/asm-x86/tsc.h | |||
@@ -16,6 +16,10 @@ typedef unsigned long long cycles_t; | |||
16 | 16 | ||
17 | extern unsigned int cpu_khz; | 17 | extern unsigned int cpu_khz; |
18 | extern unsigned int tsc_khz; | 18 | extern unsigned int tsc_khz; |
19 | /* flag for disabling the tsc */ | ||
20 | extern int tsc_disable; | ||
21 | |||
22 | extern void disable_TSC(void); | ||
19 | 23 | ||
20 | static inline cycles_t get_cycles(void) | 24 | static inline cycles_t get_cycles(void) |
21 | { | 25 | { |