diff options
Diffstat (limited to 'arch/x86/kernel/vsyscall_64.c')
-rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 25ee06a80aad..e02d92d12bcd 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -87,6 +87,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock) | |||
87 | vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec; | 87 | vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec; |
88 | vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; | 88 | vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; |
89 | vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; | 89 | vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; |
90 | vsyscall_gtod_data.wall_time_coarse = __current_kernel_time(); | ||
90 | write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); | 91 | write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); |
91 | } | 92 | } |
92 | 93 | ||
@@ -227,24 +228,16 @@ static long __vsyscall(3) venosys_1(void) | |||
227 | } | 228 | } |
228 | 229 | ||
229 | #ifdef CONFIG_SYSCTL | 230 | #ifdef CONFIG_SYSCTL |
230 | |||
231 | static int | ||
232 | vsyscall_sysctl_change(ctl_table *ctl, int write, struct file * filp, | ||
233 | void __user *buffer, size_t *lenp, loff_t *ppos) | ||
234 | { | ||
235 | return proc_dointvec(ctl, write, filp, buffer, lenp, ppos); | ||
236 | } | ||
237 | |||
238 | static ctl_table kernel_table2[] = { | 231 | static ctl_table kernel_table2[] = { |
239 | { .procname = "vsyscall64", | 232 | { .procname = "vsyscall64", |
240 | .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), | 233 | .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), |
241 | .mode = 0644, | 234 | .mode = 0644, |
242 | .proc_handler = vsyscall_sysctl_change }, | 235 | .proc_handler = proc_dointvec }, |
243 | {} | 236 | {} |
244 | }; | 237 | }; |
245 | 238 | ||
246 | static ctl_table kernel_root_table2[] = { | 239 | static ctl_table kernel_root_table2[] = { |
247 | { .ctl_name = CTL_KERN, .procname = "kernel", .mode = 0555, | 240 | { .procname = "kernel", .mode = 0555, |
248 | .child = kernel_table2 }, | 241 | .child = kernel_table2 }, |
249 | {} | 242 | {} |
250 | }; | 243 | }; |