forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into timers/core

Browse source 
Reason: Further posix_cpu_timer patches depend on mainline changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2010-05-10 11:59:37 +02:00
commit dbb6be6d5e
5707 changed files with 100984 additions and 21049 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/time/timekeeping.c
View file

@ -806,7 +806,8 @@ void update_wall_time(void)
shift = min(shift, maxshift);
while (offset >= timekeeper.cycle_interval) {
offset = logarithmic_accumulation(offset, shift);
shift--;
if(offset < timekeeper.cycle_interval<<shift)
shift--;
}
/* correct the clock when NTP error is too big */