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

Linus Torvalds committed 10 years ago

Commit 1c333362 parents 28e6815 08d07252 files · +3 −1Browse files

Unified · Split

2 files

drivers/clocksource/timer-atmel-pit.c +1 −0
kernel/time/tick-sched.c +2 −1

drivers/clocksource/timer-atmel-pit.c+1−0

@@ -240,6 +240,7 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data) · 239 unmodified lines
240	240	static int __init at91sam926x_pit_dt_init(struct device_node *node)
241	241	{
242	242	struct pit_data *data;
	243	+ int ret;
243	244
244	245	data = kzalloc(sizeof(*data), GFP_KERNEL);
245	246	if (!data)

kernel/time/tick-sched.c+2−1

@@ -908,10 +908,11 @@ static void __tick_nohz_idle_enter(struct tick_sched *ts) · 907 unmodified lines
908	908	ktime_t now, expires;
909	909	int cpu = smp_processor_id();
910	910
	911	+ now = tick_nohz_start_idle(ts);
	912	+
911	913	if (can_stop_idle_tick(cpu, ts)) {
912	914	int was_stopped = ts->tick_stopped;
913	915
914		− now = tick_nohz_start_idle(ts);
915	916	ts->idle_calls++;
916	917
917	918	expires = tick_nohz_stop_sched_tick(ts, now, cpu);