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

Commit 6ac15baa 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:
 "This contains:

   - a build regression fix introduced by the timeconst move

   - a hotplug regression fix introduced by the timer wheel diet

   - a cpu hotplug bug fix for the exynos clocksource driver"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Remove development rules from Kbuild/Makefile
  timer: Fix hotplug regression
  clocksource: exynos_mct: Avoid blocking calls in the cpu hotplug notifier
parents d5fb8213 65f26062

Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ $(obj)/$(bounds-file): kernel/bounds.s FORCE 


timeconst-file := include/generated/timeconst.h



#always  += $(timeconst-file)

targets += $(timeconst-file)



quiet_cmd_gentimeconst = GEN     $@

drivers/clocksource/exynos_mct.c

+30 −13
Original line number Diff line number Diff line
@@ -462,15 +462,12 @@ static int exynos4_local_timer_setup(struct clock_event_device *evt) 
	exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);



	if (mct_int_type == MCT_INT_SPI) {

		evt->irq = mct_irqs[MCT_L0_IRQ + cpu];

		if (request_irq(evt->irq, exynos4_mct_tick_isr,

				IRQF_TIMER | IRQF_NOBALANCING,

				evt->name, mevt)) {

			pr_err("exynos-mct: cannot register IRQ %d\n",

				evt->irq);



		if (evt->irq == -1)

			return -EIO;

		}

		irq_force_affinity(mct_irqs[MCT_L0_IRQ + cpu], cpumask_of(cpu));



		irq_force_affinity(evt->irq, cpumask_of(cpu));

		enable_irq(evt->irq);

	} else {

		enable_percpu_irq(mct_irqs[MCT_L0_IRQ], 0);

	}
@@ -483,11 +480,13 @@ static int exynos4_local_timer_setup(struct clock_event_device *evt) 
static void exynos4_local_timer_stop(struct clock_event_device *evt)

{

	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);

	if (mct_int_type == MCT_INT_SPI)

		free_irq(evt->irq, this_cpu_ptr(&percpu_mct_tick));

	else

	if (mct_int_type == MCT_INT_SPI) {

		if (evt->irq != -1)

			disable_irq_nosync(evt->irq);

	} else {

		disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);

	}

}



static int exynos4_mct_cpu_notify(struct notifier_block *self,

					   unsigned long action, void *hcpu)
@@ -518,7 +517,7 @@ static struct notifier_block exynos4_mct_cpu_nb = { 


static void __init exynos4_timer_resources(struct device_node *np, void __iomem *base)

{

	int err;

	int err, cpu;

	struct mct_clock_event_device *mevt = this_cpu_ptr(&percpu_mct_tick);

	struct clk *mct_clk, *tick_clk;
@@ -545,7 +544,25 @@ static void __init exynos4_timer_resources(struct device_node *np, void __iomem 
		WARN(err, "MCT: can't request IRQ %d (%d)\n",

		     mct_irqs[MCT_L0_IRQ], err);

	} else {

		irq_set_affinity(mct_irqs[MCT_L0_IRQ], cpumask_of(0));

		for_each_possible_cpu(cpu) {

			int mct_irq = mct_irqs[MCT_L0_IRQ + cpu];

			struct mct_clock_event_device *pcpu_mevt =

				per_cpu_ptr(&percpu_mct_tick, cpu);



			pcpu_mevt->evt.irq = -1;



			irq_set_status_flags(mct_irq, IRQ_NOAUTOEN);

			if (request_irq(mct_irq,

					exynos4_mct_tick_isr,

					IRQF_TIMER | IRQF_NOBALANCING,

					pcpu_mevt->name, pcpu_mevt)) {

				pr_err("exynos-mct: cannot register IRQ (cpu%d)\n",

									cpu);



				continue;

			}

			pcpu_mevt->evt.irq = mct_irq;

		}

	}



	err = register_cpu_notifier(&exynos4_mct_cpu_nb);

kernel/time/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -12,5 +12,3 @@ obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o 
obj-$(CONFIG_TIMER_STATS)			+= timer_stats.o

obj-$(CONFIG_DEBUG_FS)				+= timekeeping_debug.o

obj-$(CONFIG_TEST_UDELAY)			+= test_udelay.o
 


$(obj)/time.o: $(objtree)/include/config/

kernel/time/timer.c

+2 −1
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ static void migrate_timers(int cpu) 


	BUG_ON(cpu_online(cpu));

	old_base = per_cpu_ptr(&tvec_bases, cpu);

	new_base = this_cpu_ptr(&tvec_bases);

	new_base = get_cpu_ptr(&tvec_bases);

	/*

	 * The caller is globally serialized and nobody else

	 * takes two locks at once, deadlock is not possible.
@@ -1590,6 +1590,7 @@ static void migrate_timers(int cpu) 


	spin_unlock(&old_base->lock);

	spin_unlock_irq(&new_base->lock);

	put_cpu_ptr(&tvec_bases);

}



static int timer_cpu_notify(struct notifier_block *self,