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

Commit ecc8b655 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: adjust tick_nohz_stop_sched_tick() call of s390 as well
  nohz: prevent tick stop outside of the idle loop
parents 2528ce32 e338125b

arch/arm/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ void cpu_idle(void) 
		if (!idle)

			idle = default_idle;

		leds_event(led_idle_start);

		tick_nohz_stop_sched_tick();

		tick_nohz_stop_sched_tick(1);

		while (!need_resched())

			idle();

		leds_event(led_idle_end);

arch/avr32/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void cpu_idle(void) 
{

	/* endless idle loop with no priority at all */

	while (1) {

		tick_nohz_stop_sched_tick();

		tick_nohz_stop_sched_tick(1);

		while (!need_resched())

			cpu_idle_sleep();

		tick_nohz_restart_sched_tick();

arch/blackfin/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void cpu_idle(void) 
#endif

		if (!idle)

			idle = default_idle;

		tick_nohz_stop_sched_tick();

		tick_nohz_stop_sched_tick(1);

		while (!need_resched())

			idle();

		tick_nohz_restart_sched_tick();

arch/mips/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void __noreturn cpu_idle(void) 
{

	/* endless idle loop with no priority at all */

	while (1) {

		tick_nohz_stop_sched_tick();

		tick_nohz_stop_sched_tick(1);

		while (!need_resched()) {

#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG

			extern void smtc_idle_loop_hook(void);

arch/powerpc/kernel/idle.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void cpu_idle(void) 


	set_thread_flag(TIF_POLLING_NRFLAG);

	while (1) {

		tick_nohz_stop_sched_tick();

		tick_nohz_stop_sched_tick(1);

		while (!need_resched() && !cpu_should_die()) {

			ppc64_runlatch_off();