diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
| commit | f0612bbc41f65f5a684f69d714a1a17a6f0f40c5 (patch) | |
| tree | 8c070070bb355843cfa4635643e9da7c2c4cd44a /kernel/timer.c | |
| parent | b0c4e148bd591629749d02a8fbc8d81c26d548cf (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 3ba10fa35b60..6a2e5f8dc725 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -752,6 +752,15 @@ static void second_overflow(void) | |||
| 752 | else | 752 | else |
| 753 | time_adj += (time_adj >> 2) + (time_adj >> 5); | 753 | time_adj += (time_adj >> 2) + (time_adj >> 5); |
| 754 | #endif | 754 | #endif |
| 755 | #if HZ == 250 | ||
| 756 | /* Compensate for (HZ==250) != (1 << SHIFT_HZ). | ||
| 757 | * Add 1.5625% and 0.78125% to get 255.85938; => only 0.05% error (p. 14) | ||
| 758 | */ | ||
| 759 | if (time_adj < 0) | ||
| 760 | time_adj -= (-time_adj >> 6) + (-time_adj >> 7); | ||
| 761 | else | ||
| 762 | time_adj += (time_adj >> 6) + (time_adj >> 7); | ||
| 763 | #endif | ||
| 755 | #if HZ == 1000 | 764 | #if HZ == 1000 |
| 756 | /* Compensate for (HZ==1000) != (1 << SHIFT_HZ). | 765 | /* Compensate for (HZ==1000) != (1 << SHIFT_HZ). |
| 757 | * Add 1.5625% and 0.78125% to get 1023.4375; => only 0.05% error (p. 14) | 766 | * Add 1.5625% and 0.78125% to get 1023.4375; => only 0.05% error (p. 14) |