Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29d03fa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  posix_timer: Fix error path in timer_create
  hrtimer: Avoid double seqlock
  timers: Move local variable into else section
  timers: Fix slack calculation really
parents 89ad6a61 45e0fffc

kernel/hrtimer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) 




	do {

	do {

		seq = read_seqbegin(&xtime_lock);

		seq = read_seqbegin(&xtime_lock);

		xts = current_kernel_time();

		xts = __current_kernel_time();

		tom = wall_to_monotonic;

		tom = wall_to_monotonic;

	} while (read_seqretry(&xtime_lock, seq));

	} while (read_seqretry(&xtime_lock, seq));

kernel/posix-timers.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -559,14 +559,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, 
	new_timer->it_id = (timer_t) new_timer_id;

	new_timer->it_id = (timer_t) new_timer_id;

	new_timer->it_clock = which_clock;

	new_timer->it_clock = which_clock;

	new_timer->it_overrun = -1;

	new_timer->it_overrun = -1;

	error = CLOCK_DISPATCH(which_clock, timer_create, (new_timer));

	if (error)

		goto out;





	/*

	 * return the timer_id now.  The next step is hard to

	 * back out if there is an error.

	 */

	if (copy_to_user(created_timer_id,

	if (copy_to_user(created_timer_id,

			 &new_timer_id, sizeof (new_timer_id))) {

			 &new_timer_id, sizeof (new_timer_id))) {

		error = -EFAULT;

		error = -EFAULT;
@@ -597,6 +590,10 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, 
	new_timer->sigq->info.si_tid   = new_timer->it_id;

	new_timer->sigq->info.si_tid   = new_timer->it_id;

	new_timer->sigq->info.si_code  = SI_TIMER;

	new_timer->sigq->info.si_code  = SI_TIMER;





	error = CLOCK_DISPATCH(which_clock, timer_create, (new_timer));

	if (error)

		goto out;



	spin_lock_irq(&current->sighand->siglock);

	spin_lock_irq(&current->sighand->siglock);

	new_timer->it_signal = current->signal;

	new_timer->it_signal = current->signal;

	list_add(&new_timer->list, &current->signal->posix_timers);

	list_add(&new_timer->list, &current->signal->posix_timers);

kernel/timer.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -752,11 +752,15 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires) 




	expires_limit = expires;

	expires_limit = expires;





	if (timer->slack > -1)

	if (timer->slack >= 0) {

		expires_limit = expires + timer->slack;

		expires_limit = expires + timer->slack;

	else if (time_after(expires, jiffies)) /* auto slack: use 0.4% */

	} else {

		expires_limit = expires + (expires - jiffies)/256;

		unsigned long now = jiffies;





		/* No slack, if already expired else auto slack 0.4% */

		if (time_after(expires, now))

			expires_limit = expires + (expires - now)/256;

	}

	mask = expires ^ expires_limit;

	mask = expires ^ expires_limit;

	if (mask == 0)

	if (mask == 0)

		return expires;

		return expires;