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

Commit 3ffc3f94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-fixes-for-linus' of... 

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  nohz: fix wrong event handler after online an offlined cpu
parents 358c323c 3c4fbe5e

include/linux/tick.h

+4 −1
Original line number Diff line number Diff line
@@ -74,10 +74,13 @@ extern struct tick_device *tick_get_device(int cpu); 
extern int tick_init_highres(void);

extern int tick_program_event(ktime_t expires, int force);

extern void tick_setup_sched_timer(void);

# endif



# if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS

extern void tick_cancel_sched_timer(int cpu);

# else

static inline void tick_cancel_sched_timer(int cpu) { }

# endif /* HIGHRES */

# endif



# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST

extern struct tick_device *tick_get_broadcast_device(void);

kernel/time/tick-sched.c

+5 −1
Original line number Diff line number Diff line
@@ -643,17 +643,21 @@ void tick_setup_sched_timer(void) 
		ts->nohz_mode = NOHZ_MODE_HIGHRES;

#endif

}

#endif /* HIGH_RES_TIMERS */



#if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS

void tick_cancel_sched_timer(int cpu)

{

	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);



# ifdef CONFIG_HIGH_RES_TIMERS

	if (ts->sched_timer.base)

		hrtimer_cancel(&ts->sched_timer);

# endif



	ts->nohz_mode = NOHZ_MODE_INACTIVE;

}

#endif /* HIGH_RES_TIMERS */

#endif



/**

 * Async notification about clocksource changes