diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 21:05:13 +0000 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2014-07-23 15:01:52 -0700 |
commit | 4a0e637738f06673725792d74eed67f8779b62c7 (patch) | |
tree | a5943ca88cc98cf65d3d2fd22f6311699ed2222b /arch/powerpc/kernel/time.c | |
parent | 09ec54429c6d10f87d1f084de53ae2c1c3a81108 (diff) | |
download | blackbird-op-linux-4a0e637738f06673725792d74eed67f8779b62c7.tar.gz blackbird-op-linux-4a0e637738f06673725792d74eed67f8779b62c7.zip |
clocksource: Get rid of cycle_last
cycle_last was added to the clocksource to support the TSC
validation. We moved that to the core code, so we can get rid of the
extra copy.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r-- | arch/powerpc/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 9fff9cdcc519..368ab374d33c 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -741,7 +741,7 @@ static cycle_t timebase_read(struct clocksource *cs) } void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, - struct clocksource *clock, u32 mult) + struct clocksource *clock, u32 mult, cycle_t cycle_last) { u64 new_tb_to_xs, new_stamp_xsec; u32 frac_sec; @@ -774,7 +774,7 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, * We expect the caller to have done the first increment of * vdso_data->tb_update_count already. */ - vdso_data->tb_orig_stamp = clock->cycle_last; + vdso_data->tb_orig_stamp = cycle_last; vdso_data->stamp_xsec = new_stamp_xsec; vdso_data->tb_to_xs = new_tb_to_xs; vdso_data->wtom_clock_sec = wtm->tv_sec; |