timekeeping: Fixup typo in update_vsyscall_old definition

In commit 4a0e637738f0 ("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 <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 11dc42da7daf52562841f583f73b6e3d40c85f8e..3e71ef85e4397f58a5bf392d8217088eab4eccd7 100644 (file)
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -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);
 

diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index e9660e52dc090610cd43a368d03e1cc442114dfe..95640dcd1899c533fc696a3fa964bbd39b3e9f01 100644 (file)
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -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