diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
| commit | 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch) | |
| tree | 5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /kernel/time.c | |
| parent | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff) | |
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/time.c b/kernel/time.c index 3585e1cc8..843ac0cbb 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -202,20 +202,20 @@ asmlinkage long sys_settimeofday(struct timeval *tv, struct timezone *tz) return do_sys_settimeofday(tv ? &new_tv : NULL, tz ? &new_tz : NULL); } -long pps_offset = 0; /* pps time offset (us) */ +long pps_offset; /* pps time offset (us) */ long pps_jitter = MAXTIME; /* time dispersion (jitter) (us) */ -long pps_freq = 0; /* frequency offset (scaled ppm) */ +long pps_freq; /* frequency offset (scaled ppm) */ long pps_stabil = MAXFREQ; /* frequency dispersion (scaled ppm) */ long pps_valid = PPS_VALID; /* pps signal watchdog counter */ int pps_shift = PPS_SHIFT; /* interval duration (s) (shift) */ -long pps_jitcnt = 0; /* jitter limit exceeded */ -long pps_calcnt = 0; /* calibration intervals */ -long pps_errcnt = 0; /* calibration errors */ -long pps_stbcnt = 0; /* stability limit exceeded */ +long pps_jitcnt; /* jitter limit exceeded */ +long pps_calcnt; /* calibration intervals */ +long pps_errcnt; /* calibration errors */ +long pps_stbcnt; /* stability limit exceeded */ /* hook for a loadable hardpps kernel module */ void (*hardpps_ptr)(struct timeval *) = (void (*)(struct timeval *))0; |