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

Commit 7c526e1f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'timers/new-apis', 'timers/ntp' and 'timers/urgent' into timers/core

parents e8684605 74019224 a2a5ac86 37bebc70

arch/powerpc/platforms/cell/spufs/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static void __spu_add_to_rq(struct spu_context *ctx) 
		list_add_tail(&ctx->rq, &spu_prio->runq[ctx->prio]);

		set_bit(ctx->prio, spu_prio->bitmap);

		if (!spu_prio->nr_waiting++)

			__mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);

			mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);

	}

}

drivers/infiniband/hw/ipath/ipath_driver.c

+3 −3
Original line number Diff line number Diff line
@@ -2715,7 +2715,7 @@ static void ipath_hol_signal_up(struct ipath_devdata *dd) 
 * to prevent HoL blocking, then start the HoL timer that

 * periodically continues, then stop procs, so they can detect

 * link down if they want, and do something about it.

 * Timer may already be running, so use __mod_timer, not add_timer.

 * Timer may already be running, so use mod_timer, not add_timer.

 */

void ipath_hol_down(struct ipath_devdata *dd)

{
@@ -2724,7 +2724,7 @@ void ipath_hol_down(struct ipath_devdata *dd) 
	dd->ipath_hol_next = IPATH_HOL_DOWNCONT;

	dd->ipath_hol_timer.expires = jiffies +

		msecs_to_jiffies(ipath_hol_timeout_ms);

	__mod_timer(&dd->ipath_hol_timer, dd->ipath_hol_timer.expires);

	mod_timer(&dd->ipath_hol_timer, dd->ipath_hol_timer.expires);

}



/*
@@ -2763,7 +2763,7 @@ void ipath_hol_event(unsigned long opaque) 
	else {

		dd->ipath_hol_timer.expires = jiffies +

			msecs_to_jiffies(ipath_hol_timeout_ms);

		__mod_timer(&dd->ipath_hol_timer,

		mod_timer(&dd->ipath_hol_timer,

			dd->ipath_hol_timer.expires);

	}

}

include/linux/timer.h

+2 −20
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static inline int timer_pending(const struct timer_list * timer) 


extern void add_timer_on(struct timer_list *timer, int cpu);

extern int del_timer(struct timer_list * timer);

extern int __mod_timer(struct timer_list *timer, unsigned long expires);

extern int mod_timer(struct timer_list *timer, unsigned long expires);

extern int mod_timer_pending(struct timer_list *timer, unsigned long expires);



/*

 * The jiffies value which is added to now, when there is no timer
@@ -146,25 +146,7 @@ static inline void timer_stats_timer_clear_start_info(struct timer_list *timer) 
}

#endif



/**

 * add_timer - start a timer

 * @timer: the timer to be added

 *

 * The kernel will do a ->function(->data) callback from the

 * timer interrupt at the ->expires point in the future. The

 * current time is 'jiffies'.

 *

 * The timer's ->expires, ->function (and if the handler uses it, ->data)

 * fields must be set prior calling this function.

 *

 * Timers with an ->expires field in the past will be executed in the next

 * timer tick.

 */

static inline void add_timer(struct timer_list *timer)

{

	BUG_ON(timer_pending(timer));

	__mod_timer(timer, timer->expires);

}

extern void add_timer(struct timer_list *timer);



#ifdef CONFIG_SMP

  extern int try_to_del_timer_sync(struct timer_list *timer);

include/linux/timex.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ struct timex { 
 * offset and maximum frequency tolerance.

 */

#define SHIFT_USEC 16		/* frequency offset scale (shift) */

#define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))

#define PPM_SCALE ((s64)NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))

#define PPM_SCALE_INV_SHIFT 19

#define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \

		       PPM_SCALE + 1)

kernel/posix-cpu-timers.c

+2 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,8 @@ static inline int fastpath_timer_check(struct task_struct *tsk) 
		if (task_cputime_expired(&group_sample, &sig->cputime_expires))

			return 1;

	}

	return 0;



	return sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY;

}



/*