Commit 4bfc8288 authored by Len Brown's avatar Len Brown
Browse files

x86 idle: move mwait_idle_with_hints() to where it is used 



...and make it static

no functional change

cc: x86@kernel.org
Acked-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d91ee586

arch/x86/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -751,8 +751,6 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx) 
		     :: "a" (eax), "c" (ecx));

}



extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);



extern void select_idle_routine(const struct cpuinfo_x86 *c);

extern void init_amd_e400_c1e_mask(void);

arch/x86/kernel/acpi/cstate.c

+23 −0
Original line number Diff line number Diff line
@@ -149,6 +149,29 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, 
}

EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe);



/*

 * This uses new MONITOR/MWAIT instructions on P4 processors with PNI,

 * which can obviate IPI to trigger checking of need_resched.

 * We execute MONITOR against need_resched and enter optimized wait state

 * through MWAIT. Whenever someone changes need_resched, we would be woken

 * up from MWAIT (without an IPI).

 *

 * New with Core Duo processors, MWAIT can take some hints based on CPU

 * capability.

 */

void mwait_idle_with_hints(unsigned long ax, unsigned long cx)

{

	if (!need_resched()) {

		if (this_cpu_has(X86_FEATURE_CLFLUSH_MONITOR))

			clflush((void *)&current_thread_info()->flags);



		__monitor((void *)&current_thread_info()->flags, 0, 0);

		smp_mb();

		if (!need_resched())

			__mwait(ax, cx);

	}

}



void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx)

{

	unsigned int cpu = smp_processor_id();

arch/x86/kernel/process.c

+0 −23
Original line number Diff line number Diff line
@@ -438,29 +438,6 @@ void cpu_idle_wait(void) 
}

EXPORT_SYMBOL_GPL(cpu_idle_wait);



/*

 * This uses new MONITOR/MWAIT instructions on P4 processors with PNI,

 * which can obviate IPI to trigger checking of need_resched.

 * We execute MONITOR against need_resched and enter optimized wait state

 * through MWAIT. Whenever someone changes need_resched, we would be woken

 * up from MWAIT (without an IPI).

 *

 * New with Core Duo processors, MWAIT can take some hints based on CPU

 * capability.

 */

void mwait_idle_with_hints(unsigned long ax, unsigned long cx)

{

	if (!need_resched()) {

		if (this_cpu_has(X86_FEATURE_CLFLUSH_MONITOR))

			clflush((void *)&current_thread_info()->flags);



		__monitor((void *)&current_thread_info()->flags, 0, 0);

		smp_mb();

		if (!need_resched())

			__mwait(ax, cx);

	}

}



/* Default MONITOR/MWAIT with no hints, used for default C1 state */

static void mwait_idle(void)

{