diff options
| author | Andy Lutomirski <luto@mit.edu> | 2011-07-14 06:47:22 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-14 17:57:05 -0700 |
| commit | 98d0ac38ca7b1b7a552c9a2359174ff84decb600 (patch) | |
| tree | 0c244e828f86c779c348a4888ed9e303c3e59811 /arch/x86/include/asm/vgtod.h | |
| parent | 433bd805e5fd2c731b3a9025b034f066272d336e (diff) | |
| download | linux-stable-98d0ac38ca7b1b7a552c9a2359174ff84decb600.tar.gz linux-stable-98d0ac38ca7b1b7a552c9a2359174ff84decb600.tar.bz2 linux-stable-98d0ac38ca7b1b7a552c9a2359174ff84decb600.zip | |
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/vgtod.h')
| -rw-r--r-- | arch/x86/include/asm/vgtod.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h index aa5add855a91..815285bcaceb 100644 --- a/arch/x86/include/asm/vgtod.h +++ b/arch/x86/include/asm/vgtod.h @@ -13,7 +13,7 @@ struct vsyscall_gtod_data { 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; |