Commit 6ecf9680 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpuidle' into fixes 

* pm-cpuidle:
  microblaze idle: Fix compile error
  blackfin idle: Fix compile error
parents a0b1c429 c192b196

arch/blackfin/kernel/process.c

+1 −3
Original line number Diff line number Diff line
@@ -80,12 +80,10 @@ void cpu_idle(void) 
		if (cpu_is_offline(smp_processor_id()))

			cpu_die();

#endif

		if (!idle)

			idle = default_idle;

		tick_nohz_idle_enter();

		rcu_idle_enter();

		while (!need_resched())

			idle();

			default_idle();

		rcu_idle_exit();

		tick_nohz_idle_exit();

		preempt_enable_no_resched();

arch/microblaze/kernel/process.c

+1 −4
Original line number Diff line number Diff line
@@ -97,13 +97,10 @@ void cpu_idle(void) 


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

	while (1) {

		if (!idle)

			idle = default_idle;



		tick_nohz_idle_enter();

		rcu_idle_enter();

		while (!need_resched())

			idle();

			default_idle();

		rcu_idle_exit();

		tick_nohz_idle_exit();