Prev: fib6_del() bug from 2.6.34-rc1 still present in 2.6.34
Next: staging/comedi: new Kconfig and Makefiles, drivers grouped by bustype.
From: Thomas Gleixner on 24 May 2010 06:20
Linus,

please discard the previous pull and take this one. I missed the timer
fix in the first place.


Please pull the latest timers-for-linus-urgent git tree from:

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

Thanks,

tglx


------------------>
Jeff Chua (1):
timers: Fix slack calculation for expired timers

Thomas Gleixner (1):
timekeeping: Fix timezone update


kernel/time.c | 8 ++++----
kernel/timer.c | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/kernel/time.c b/kernel/time.c
index 50612fa..848b1c2 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -132,10 +132,10 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,
*/
static inline void warp_clock(void)
{
- struct timespec delta, adjust;
- delta.tv_sec = sys_tz.tz_minuteswest * 60;
- delta.tv_nsec = 0;
- adjust = timespec_add_safe(current_kernel_time(), delta);
+ struct timespec adjust;
+
+ adjust = current_kernel_time();
+ adjust.tv_sec += sys_tz.tz_minuteswest * 60;
do_settimeofday(&adjust);
}

diff --git a/kernel/timer.c b/kernel/timer.c
index 9199f3c..be394af 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -750,13 +750,14 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires)
unsigned long expires_limit, mask;
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;

mask = expires ^ expires_limit;
-
if (mask == 0)
return expires;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: fib6_del() bug from 2.6.34-rc1 still present in 2.6.34
Next: staging/comedi: new Kconfig and Makefiles, drivers grouped by bustype.