Commit c3ed9ea4 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'timers-for-linus-urgent' of...

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

* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Fix slack calculation for expired timers
  timekeeping: Fix timezone update
parents 0fed2b5c f00e047e
...@@ -132,10 +132,10 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv, ...@@ -132,10 +132,10 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,
*/ */
static inline void warp_clock(void) static inline void warp_clock(void)
{ {
struct timespec delta, adjust; struct timespec adjust;
delta.tv_sec = sys_tz.tz_minuteswest * 60;
delta.tv_nsec = 0; adjust = current_kernel_time();
adjust = timespec_add_safe(current_kernel_time(), delta); adjust.tv_sec += sys_tz.tz_minuteswest * 60;
do_settimeofday(&adjust); do_settimeofday(&adjust);
} }
......
...@@ -750,13 +750,14 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires) ...@@ -750,13 +750,14 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires)
unsigned long expires_limit, mask; unsigned long expires_limit, mask;
int bit; int bit;
expires_limit = expires + timer->slack; expires_limit = expires;
if (timer->slack < 0) /* auto slack: use 0.4% */ if (timer->slack > -1)
expires_limit = expires + timer->slack;
else if (time_after(expires, jiffies)) /* auto slack: use 0.4% */
expires_limit = expires + (expires - jiffies)/256; expires_limit = expires + (expires - jiffies)/256;
mask = expires ^ expires_limit; mask = expires ^ expires_limit;
if (mask == 0) if (mask == 0)
return expires; return expires;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment