Commit 1ab231b2 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:

 - timekeeping: Cure a subtle drift issue on GENERIC_TIME_VSYSCALL_OLD

 - nohz: Make CONFIG_NO_HZ=n and nohz=off command line option behave the
   same way.  Fixes a long standing load accounting wreckage.

 - clocksource/ARM: Kconfig update to avoid ARM=n wreckage

 - clocksource/ARM: Fixlets for the AT91 and SH clocksource/clockevents

 - Trivial documentation update and kzalloc conversion from akpms pile

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  nohz: Fix another inconsistency between CONFIG_NO_HZ=n and nohz=off
  time: Fix 1ns/tick drift w/ GENERIC_TIME_VSYSCALL_OLD
  clocksource: arm_arch_timer: Hide eventstream Kconfig on non-ARM
  clocksource: sh_tmu: Add clk_prepare/unprepare support
  clocksource: sh_tmu: Release clock when sh_tmu_register() fails
  clocksource: sh_mtu2: Add clk_prepare/unprepare support
  clocksource: sh_mtu2: Release clock when sh_mtu2_register() fails
  ARM: at91: rm9200: switch back to clockevents_config_and_register
  tick: Document tick_do_timer_cpu
  timer: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
  NOHZ: Check for nohz active instead of nohz enabled
parents dea4f48a 0e576acb

arch/arm/mach-at91/at91rm9200_time.c

+2 −5
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ clkevt32k_next_event(unsigned long delta, struct clock_event_device *dev) 
static struct clock_event_device clkevt = {

	.name		= "at91_tick",

	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.shift		= 32,

	.rating		= 150,

	.set_next_event	= clkevt32k_next_event,

	.set_mode	= clkevt32k_mode,
@@ -265,11 +264,9 @@ void __init at91rm9200_timer_init(void) 
	at91_st_write(AT91_ST_RTMR, 1);



	/* Setup timer clockevent, with minimum of two ticks (important!!) */

	clkevt.mult = div_sc(AT91_SLOW_CLOCK, NSEC_PER_SEC, clkevt.shift);

	clkevt.max_delta_ns = clockevent_delta2ns(AT91_ST_ALMV, &clkevt);

	clkevt.min_delta_ns = clockevent_delta2ns(2, &clkevt) + 1;

	clkevt.cpumask = cpumask_of(0);

	clockevents_register_device(&clkevt);

	clockevents_config_and_register(&clkevt, AT91_SLOW_CLOCK,

					2, AT91_ST_ALMV);



	/* register clocksource */

	clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK);

drivers/clocksource/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ config ARM_ARCH_TIMER 
config ARM_ARCH_TIMER_EVTSTREAM

	bool "Support for ARM architected timer event stream generation"

	default y if ARM_ARCH_TIMER

	depends on ARM_ARCH_TIMER

	help

	  This option enables support for event stream generation based on

	  the ARM architected timer. It is used for waking up CPUs executing

drivers/clocksource/sh_mtu2.c

+14 −2
Original line number Diff line number Diff line
@@ -313,8 +313,20 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) 
		goto err1;

	}



	return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),

	ret = clk_prepare(p->clk);

	if (ret < 0)

		goto err2;



	ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),

			       cfg->clockevent_rating);

	if (ret < 0)

		goto err3;



	return 0;

 err3:

	clk_unprepare(p->clk);

 err2:

	clk_put(p->clk);

 err1:

	iounmap(p->mapbase);

 err0:

drivers/clocksource/sh_tmu.c

+17 −3
Original line number Diff line number Diff line
@@ -472,12 +472,26 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) 
		ret = PTR_ERR(p->clk);

		goto err1;

	}



	ret = clk_prepare(p->clk);

	if (ret < 0)

		goto err2;



	p->cs_enabled = false;

	p->enable_count = 0;



	return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),

	ret = sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),

			      cfg->clockevent_rating,

			      cfg->clocksource_rating);

	if (ret < 0)

		goto err3;



	return 0;



 err3:

	clk_unprepare(p->clk);

 err2:

	clk_put(p->clk);

 err1:

	iounmap(p->mapbase);

 err0:

kernel/rcu/tree_plugin.h

+2 −2
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@ module_param(rcu_idle_gp_delay, int, 0644); 
static int rcu_idle_lazy_gp_delay = RCU_IDLE_LAZY_GP_DELAY;

module_param(rcu_idle_lazy_gp_delay, int, 0644);



extern int tick_nohz_enabled;

extern int tick_nohz_active;



/*

 * Try to advance callbacks for all flavors of RCU on the current CPU, but
@@ -1729,7 +1729,7 @@ static void rcu_prepare_for_idle(int cpu) 
	int tne;



	/* Handle nohz enablement switches conservatively. */

	tne = ACCESS_ONCE(tick_nohz_enabled);

	tne = ACCESS_ONCE(tick_nohz_active);

	if (tne != rdtp->tick_nohz_enabled_snap) {

		if (rcu_cpu_has_callbacks(cpu, NULL))

			invoke_rcu_core(); /* force nohz to see update. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE