Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61655
b: refs/heads/master
c: 71120f1
h: refs/heads/master
i:
  61653: 1026818
  61651: beda945
  61647: bf86437
v: v3
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jul 19, 2007
1 parent afd42a4 commit 416e848
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 10146801e8b960d7473e350b60458d9d5a2be1cf
refs/heads/master: 71120f183bff04ba4f7ba3cc554202061912d548
4 changes: 2 additions & 2 deletions trunk/kernel/time/timekeeping.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
static void clocksource_adjust(struct clocksource *clock, s64 offset)
static void clocksource_adjust(s64 offset)
{
s64 error, interval = clock->cycle_interval;
int adj;
Expand Down Expand Up @@ -476,7 +476,7 @@ void update_wall_time(void)
}

/* 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;
Expand Down

0 comments on commit 416e848

Please sign in to comment.