Skip to contentSkip to conversation

timer fixes for 3.9

GIT PULL Thomas Gleixner 1 participant 1 message Apr 15, 2013

lore
Share & tools
lore
#0 lore raw

Linus,

please pull the latest timers-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

* Single bug fix for a cpu hotplug race.

Thanks,

tglx

------------------>
Michael Bohan (1):
hrtimer: Don't reinitialize a cpu_base lock on CPU_UP

 kernel/hrtimer.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
kernel/hrtimer.c +1 -2
index cc47812..14be27f 100644
@@ -63,6 +63,7 @@
 DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =
 {
 
+	.lock = __RAW_SPIN_LOCK_UNLOCKED(hrtimer_bases.lock),
 	.clock_base =
 	{
 		{
@@ -1642,8 +1643,6 @@ static void __cpuinit init_hrtimers_cpu(int cpu)
 	struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
 	int i;
 
-	raw_spin_lock_init(&cpu_base->lock);
-
 	for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
 		cpu_base->clock_base[i].cpu_base = cpu_base;
 		timerqueue_init_head(&cpu_base->clock_base[i].active);