diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /kernel/time.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time.c b/kernel/time.c index ff3a5d684..0f1094655 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -262,7 +262,7 @@ int do_adjtimex(struct timex *txc) if (txc->modes & ADJ_TIMECONST) time_constant = txc->constant; - if (txc->modes & ADJ_OFFSET) + if (txc->modes & ADJ_OFFSET) { if ((txc->modes == ADJ_OFFSET_SINGLESHOT) || !(time_status & STA_PLL)) { @@ -327,6 +327,7 @@ int do_adjtimex(struct timex *txc) else if (time_freq < -time_tolerance) time_freq = -time_tolerance; } /* STA_PLL || STA_PPSTIME */ + } if (txc->modes & ADJ_TICK) tick = txc->tick; |