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@xxxxxxxxxx> --- include/asm-x86/processor_32.h | 7 ------- include/asm-x86/tsc.h | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) Index: linux-2.6-x86/include/asm-x86/processor_32.h =================================================================== --- linux-2.6-x86.orig/include/asm-x86/processor_32.h +++ linux-2.6-x86/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. */ Index: linux-2.6-x86/include/asm-x86/tsc.h =================================================================== --- linux-2.6-x86.orig/include/asm-x86/tsc.h +++ linux-2.6-x86/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) { _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/virtualization