From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 27 Jan 2018 14:35:29 +0000 (+0100)
Subject: Merge branch 'timers/urgent' into timers/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=303c146df1c4574db3495d9acc5c440dd46c6b0f;p=linux.git

Merge branch 'timers/urgent' into timers/core

Pick up urgent bug fix and resolve the conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

303c146df1c4574db3495d9acc5c440dd46c6b0f
diff --cc kernel/time/hrtimer.c
index 3d201582630df,aa9d2a2b12109..ae0c8a411fe72
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@@ -1759,10 -1591,9 +1759,14 @@@ int hrtimers_prepare_cpu(unsigned int c
  		timerqueue_init_head(&cpu_base->clock_base[i].active);
  	}
  
 -	cpu_base->active_bases = 0;
  	cpu_base->cpu = cpu;
 -	hrtimer_init_hres(cpu_base);
++	cpu_base->active_bases = 0;
 +	cpu_base->hres_active = 0;
++	cpu_base->hang_detected = 0;
++	cpu_base->next_timer = NULL;
++	cpu_base->softirq_next_timer = NULL;
 +	cpu_base->expires_next = KTIME_MAX;
 +	cpu_base->softirq_expires_next = KTIME_MAX;
  	return 0;
  }