Commit 6a377ddc authored by Len Brown's avatar Len Brown
Browse files

xen idle: make xen-specific macro xen-specific 



This macro is only invoked by Xen,
so make its definition specific to Xen.

> set_pm_idle_to_default()
< xen_set_default_idle()

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Cc: xen-devel@lists.xensource.com
parent 88b62b91

arch/x86/include/asm/processor.h

+5 −1
Original line number Diff line number Diff line
@@ -998,7 +998,11 @@ extern unsigned long arch_align_stack(unsigned long sp); 
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);



void default_idle(void);

bool set_pm_idle_to_default(void);

#ifdef	CONFIG_XEN

bool xen_set_default_idle(void);

#else

#define xen_set_default_idle 0

#endif



void stop_this_cpu(void *dummy);

arch/x86/kernel/process.c

+3 −1
Original line number Diff line number Diff line
@@ -396,7 +396,8 @@ void default_idle(void) 
EXPORT_SYMBOL(default_idle);

#endif



bool set_pm_idle_to_default(void)

#ifdef CONFIG_XEN

bool xen_set_default_idle(void)

{

	bool ret = !!pm_idle;
@@ -404,6 +405,7 @@ bool set_pm_idle_to_default(void) 


	return ret;

}

#endif

void stop_this_cpu(void *dummy)

{

	local_irq_disable();

arch/x86/xen/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ void __init xen_arch_setup(void) 
#endif

	disable_cpuidle();

	disable_cpufreq();

	WARN_ON(set_pm_idle_to_default());

	WARN_ON(xen_set_default_idle());

	fiddle_vdso();

#ifdef CONFIG_NUMA

	numa_off = 1;