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

Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse source 
* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimer: Fix /proc/timer_list regression
  itimers: Fix racy writes to cpu_itimer fields
  timekeeping: Fix clock_gettime vsyscall time warp
This commit is contained in:
Linus Torvalds 2009-12-08 19:28:09 -08:00
commit fbf07eac7b
8 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/time/timekeeping.c
View file

@ -170,7 +170,7 @@ void timekeeping_leap_insert(int leapsecond)
{
xtime.tv_sec += leapsecond;
wall_to_monotonic.tv_sec -= leapsecond;
update_vsyscall(&xtime, timekeeper.clock);
update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult);
}
#ifdef CONFIG_GENERIC_TIME
@ -328,7 +328,7 @@ int do_settimeofday(struct timespec *tv)
timekeeper.ntp_error = 0;
ntp_clear();
update_vsyscall(&xtime, timekeeper.clock);
update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult);
write_sequnlock_irqrestore(&xtime_lock, flags);
@ -840,7 +840,7 @@ void update_wall_time(void)
timekeeper.ntp_error_shift;
/* check to see if there is a new clocksource to use */
update_vsyscall(&xtime, timekeeper.clock);
update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult);
}
/**