Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c60b0c28 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: Fix the update_vsyscall() prototype 



With commit 576094b7 (time: Introduce new GENERIC_TIME_VSYSCALL) the old
update_vsyscall() prototype is no longer available. This patch updates
the arm64 port.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: John Stultz <john.stultz@linaro.org>
parent fea2acaa

arch/arm64/kernel/vdso.c

+10 −10
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/sched.h>

#include <linux/signal.h>

#include <linux/slab.h>

#include <linux/timekeeper_internal.h>

#include <linux/vmalloc.h>



#include <asm/cacheflush.h>
@@ -222,11 +223,10 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm) 
/*

 * Update the vDSO data page to keep in sync with kernel timekeeping.

 */

void update_vsyscall(struct timespec *ts, struct timespec *wtm,

		     struct clocksource *clock, u32 mult)

void update_vsyscall(struct timekeeper *tk)

{

	struct timespec xtime_coarse;

	u32 use_syscall = strcmp(clock->name, "arch_sys_counter");

	u32 use_syscall = strcmp(tk->clock->name, "arch_sys_counter");



	++vdso_data->tb_seq_count;

	smp_wmb();
@@ -237,13 +237,13 @@ void update_vsyscall(struct timespec *ts, struct timespec *wtm, 
	vdso_data->xtime_coarse_nsec		= xtime_coarse.tv_nsec;



	if (!use_syscall) {

		vdso_data->cs_cycle_last	= clock->cycle_last;

		vdso_data->xtime_clock_sec	= ts->tv_sec;

		vdso_data->xtime_clock_nsec	= ts->tv_nsec;

		vdso_data->cs_mult		= mult;

		vdso_data->cs_shift		= clock->shift;

		vdso_data->wtm_clock_sec	= wtm->tv_sec;

		vdso_data->wtm_clock_nsec	= wtm->tv_nsec;

		vdso_data->cs_cycle_last	= tk->clock->cycle_last;

		vdso_data->xtime_clock_sec	= tk->xtime_sec;

		vdso_data->xtime_clock_nsec	= tk->xtime_nsec >> tk->shift;

		vdso_data->cs_mult		= tk->mult;

		vdso_data->cs_shift		= tk->shift;

		vdso_data->wtm_clock_sec	= tk->wall_to_monotonic.tv_sec;

		vdso_data->wtm_clock_nsec	= tk->wall_to_monotonic.tv_nsec;

	}



	smp_wmb();