Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192245
b: refs/heads/master
c: e1292ba
h: refs/heads/master
i:
  192243: b77ee26
v: v3
  • Loading branch information
John Stultz authored and Thomas Gleixner committed Mar 23, 2010
1 parent ce597ad commit ffdc3fc
Show file tree
Hide file tree
Showing 3 changed files with 2 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: 12b8aeee3e51654fb95a3baff2e093f2513bb87d
refs/heads/master: e1292ba164742e3a236e407148e00300b7196906
1 change: 0 additions & 1 deletion trunk/include/linux/timex.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ extern int tickadj; /* amount of adjustment per tick */
* phase-lock loop variables
*/
extern int time_status; /* clock synchronization status bits */
extern long time_adjust; /* The amount of adjtime left */

extern void ntp_init(void);
extern void ntp_clear(void);
Expand Down
2 changes: 1 addition & 1 deletion trunk/kernel/time/ntp.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static s64 time_freq;
/* time at last adjustment (secs): */
static long time_reftime;

long time_adjust;
static long time_adjust;

/* constant (boot-param configurable) NTP tick adjustment (upscaled) */
static s64 ntp_tick_adj;
Expand Down

0 comments on commit ffdc3fc

Please sign in to comment.