Commit c3ed9ea4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

kernel/time.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

}

kernel/timer.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE