Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 288795
b: refs/heads/master
c: 058892e
h: refs/heads/master
i:
  288793: 6ee4abb
  288791: ac4e68b
v: v3
  • Loading branch information
Thomas Gleixner authored and John Stultz committed Jan 27, 2012
1 parent 06d968b commit 7c37990
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: 92c1d3ed4dc0b8cfb10e85ed0c9934db41efc027
refs/heads/master: 058892e632aa53be8255c2f0a42f9ace7bed66bb
4 changes: 2 additions & 2 deletions trunk/kernel/time/timekeeping.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
struct timekeeper {
/* Current clocksource used for timekeeping. */
struct clocksource *clock;
/* NTP adjusted clock multiplier */
u32 mult;
/* The shift value of the current clocksource. */
int shift;

Expand All @@ -45,8 +47,6 @@ struct timekeeper {
/* Shift conversion between clock shifted nano seconds and
* ntp shifted nano seconds. */
int ntp_error_shift;
/* NTP adjusted clock multiplier */
u32 mult;

/* The current time */
struct timespec xtime;
Expand Down

0 comments on commit 7c37990

Please sign in to comment.