Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

[firefly-linux-kernel-4.4.55.git] / arch / x86 / include / asm / tsc.h

diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 15d99153a96d31a52a72dd69a4f73ddd93373fc8..c91e8b9d588b14d0f86b4ea7a82b5d07c8387c2c 100644 (file)
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -61,7 +61,7 @@ extern void check_tsc_sync_source(int cpu);
 extern void check_tsc_sync_target(void);
 
 extern int notsc_setup(char *);
-extern void save_sched_clock_state(void);
-extern void restore_sched_clock_state(void);
+extern void tsc_save_sched_clock_state(void);
+extern void tsc_restore_sched_clock_state(void);
 
 #endif /* _ASM_X86_TSC_H */