| commit | 98d0ac38ca7b1b7a552c9a2359174ff84decb600 | [log] [tgz] |
|---|---|---|
| author | Andy Lutomirski <luto@mit.edu> | Thu Jul 14 06:47:22 2011 -0400 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Thu Jul 14 17:57:05 2011 -0700 |
| tree | 0c244e828f86c779c348a4888ed9e303c3e59811 | |
| parent | 433bd805e5fd2c731b3a9025b034f066272d336e [diff] [blame] |
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>
diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h index aa5add8..815285b 100644 --- a/arch/x86/include/asm/vgtod.h +++ b/arch/x86/include/asm/vgtod.h
@@ -13,7 +13,7 @@ struct timezone sys_tz; struct { /* extract of a clocksource struct */ - cycle_t (*vread)(void); + int vclock_mode; cycle_t cycle_last; cycle_t mask; u32 mult;