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

Commit 1c333360 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer fixes from Thomas Gleixner:
 "Two fixlet from the timers departement:

   - A fix for scheduler stalls in the tick idle code affecting
     NOHZ_FULL kernels

   - A trivial compile fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick/nohz: Fix softlockup on scheduler stalls in kvm guest
  clocksource/drivers/atmel-pit: Fix compilation error
parents 28e68154 08d07259

drivers/clocksource/timer-atmel-pit.c

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data) 
static int __init at91sam926x_pit_dt_init(struct device_node *node)

{

	struct pit_data *data;

	int ret;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

kernel/time/tick-sched.c

+2 −1
Original line number Diff line number Diff line
@@ -908,10 +908,11 @@ static void __tick_nohz_idle_enter(struct tick_sched *ts) 
	ktime_t now, expires;

	int cpu = smp_processor_id();



	now = tick_nohz_start_idle(ts);



	if (can_stop_idle_tick(cpu, ts)) {

		int was_stopped = ts->tick_stopped;



		now = tick_nohz_start_idle(ts);

		ts->idle_calls++;



		expires = tick_nohz_stop_sched_tick(ts, now, cpu);