Skip to content

Commit

Permalink
timekeeping: Fixup typo in update_vsyscall_old definition
Browse files Browse the repository at this point in the history
In commit 4a0e637 ("clocksource: Get rid of cycle_last"),
currently in the -tip tree, there was a small typo where cycles_t
was used intstead of cycle_t. This broke ppc64 builds.

Fix this by using the proper cycle_t type for this usage, in
both the definition and the ia64 implementation.

Now, having both cycle_t and cycles_t types seems like a very
bad idea just asking for these sorts of issues. But that
will be a cleanup for another day.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1406349439-11785-1-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
johnstultz-work authored and KAGA-KOKO committed Jul 30, 2014
1 parent 7806f60 commit 953dec2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/ia64/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ void update_vsyscall_tz(void)
}

void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
struct clocksource *c, u32 mult, cycles_t cycle_last)
struct clocksource *c, u32 mult, cycle_t cycle_last)
{
write_seqcount_begin(&fsyscall_gtod_data.seq);

Expand Down
2 changes: 1 addition & 1 deletion include/linux/timekeeper_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ extern void update_vsyscall_tz(void);

extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
struct clocksource *c, u32 mult,
cycles_t cycle_last);
cycle_t cycle_last);
extern void update_vsyscall_tz(void);

#else
Expand Down

0 comments on commit 953dec2

Please sign in to comment.