sh idle: rename global pm_idle to static sh_idle (3738fa5b) · Commits · 戴 / test

arch/sh/kernel/idle.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	#include <asm/smp.h>		#include <asm/smp.h>
	#include <asm/bl_bit.h>		#include <asm/bl_bit.h>

	void (*pm_idle)(void);		static void (*sh_idle)(void);

	static int hlt_counter;		static int hlt_counter;

	@@ -103,9 +103,9 @@ void cpu_idle(void)
	/* Don't trace irqs off for idle */		/* Don't trace irqs off for idle */
	stop_critical_timings();		stop_critical_timings();
	if (cpuidle_idle_call())		if (cpuidle_idle_call())
	pm_idle();		sh_idle();
	/*		/*
	* Sanity check to ensure that pm_idle() returns		* Sanity check to ensure that sh_idle() returns
	* with IRQs enabled		* with IRQs enabled
	*/		*/
	WARN_ON(irqs_disabled());		WARN_ON(irqs_disabled());
	@@ -123,13 +123,13 @@ void __init select_idle_routine(void)
	/*		/*
	* If a platform has set its own idle routine, leave it alone.		* If a platform has set its own idle routine, leave it alone.
	*/		*/
	if (pm_idle)		if (sh_idle)
	return;		return;

	if (hlt_works())		if (hlt_works())
	pm_idle = default_idle;		sh_idle = default_idle;
	else		else
	pm_idle = poll_idle;		sh_idle = poll_idle;
	}		}

	void stop_this_cpu(void *unused)		void stop_this_cpu(void *unused)