projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull ia64-clocksource into release branch
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
time
/
timekeeping.c
diff --git
a/kernel/time/timekeeping.c
b/kernel/time/timekeeping.c
index
027d46c
..
88c8102
100644
(file)
--- a/
kernel/time/timekeeping.c
+++ b/
kernel/time/timekeeping.c
@@
-401,7
+401,7
@@
static __always_inline int clocksource_bigadjust(s64 error, s64 *interval,
* this is optimized for the most common adjustments of -1,0,1,
* for other values we can do a bit more work.
*/
* this is optimized for the most common adjustments of -1,0,1,
* for other values we can do a bit more work.
*/
-static void clocksource_adjust(s
truct clocksource *clock, s
64 offset)
+static void clocksource_adjust(s64 offset)
{
s64 error, interval = clock->cycle_interval;
int adj;
{
s64 error, interval = clock->cycle_interval;
int adj;
@@
-472,7
+472,7
@@
void update_wall_time(void)
}
/* correct the clock when NTP error is too big */
}
/* correct the clock when NTP error is too big */
- clocksource_adjust(
clock,
offset);
+ clocksource_adjust(offset);
/* store full nanoseconds into xtime */
xtime.tv_nsec = (s64)clock->xtime_nsec >> clock->shift;
/* store full nanoseconds into xtime */
xtime.tv_nsec = (s64)clock->xtime_nsec >> clock->shift;