diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /kernel/time/timekeeping.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 16736379a9ca..39f6177fafac 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -818,7 +818,8 @@ void update_wall_time(void) | |||
| 818 | shift = min(shift, maxshift); | 818 | shift = min(shift, maxshift); |
| 819 | while (offset >= timekeeper.cycle_interval) { | 819 | while (offset >= timekeeper.cycle_interval) { |
| 820 | offset = logarithmic_accumulation(offset, shift); | 820 | offset = logarithmic_accumulation(offset, shift); |
| 821 | shift--; | 821 | if(offset < timekeeper.cycle_interval<<shift) |
| 822 | shift--; | ||
| 822 | } | 823 | } |
| 823 | 824 | ||
| 824 | /* correct the clock when NTP error is too big */ | 825 | /* correct the clock when NTP error is too big */ |