summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/clocksource.h
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@mit.edu>2011-07-14 14:47:22 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-15 04:57:05 +0400
commit98d0ac38ca7b1b7a552c9a2359174ff84decb600 (patch)
tree0c244e828f86c779c348a4888ed9e303c3e59811 /arch/x86/include/asm/clocksource.h
parent433bd805e5fd2c731b3a9025b034f066272d336e (diff)
downloadlinux-98d0ac38ca7b1b7a552c9a2359174ff84decb600.tar.xz
x86-64: Move vread_tsc and vread_hpet into the vDSO
The vsyscall page now consists entirely of trap instructions. Cc: John Stultz <johnstul@us.ibm.com> Signed-off-by: Andy Lutomirski <luto@mit.edu> Link: http://lkml.kernel.org/r/637648f303f2ef93af93bae25186e9a1bea093f5.1310639973.git.luto@mit.edu Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/clocksource.h')
-rw-r--r--arch/x86/include/asm/clocksource.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/clocksource.h b/arch/x86/include/asm/clocksource.h
index a5df33f614c9..3882c65dc19b 100644
--- a/arch/x86/include/asm/clocksource.h
+++ b/arch/x86/include/asm/clocksource.h
@@ -7,8 +7,12 @@
#define __ARCH_HAS_CLOCKSOURCE_DATA
+#define VCLOCK_NONE 0 /* No vDSO clock available. */
+#define VCLOCK_TSC 1 /* vDSO should use vread_tsc. */
+#define VCLOCK_HPET 2 /* vDSO should use vread_hpet. */
+
struct arch_clocksource_data {
- cycle_t (*vread)(void);
+ int vclock_mode;
};
#endif /* CONFIG_X86_64 */