git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86 idle: APM requires pm_idle/default_idle unconditionally when a module
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
process.c
diff --git
a/arch/x86/kernel/process.c
b/arch/x86/kernel/process.c
index
426a5b6
..
e1ba8cb
100644
(file)
--- a/
arch/x86/kernel/process.c
+++ b/
arch/x86/kernel/process.c
@@
-337,7
+337,7
@@
EXPORT_SYMBOL(boot_option_idle_override);
* Powermanagement idle function, if any..
*/
void (*pm_idle)(void);
* Powermanagement idle function, if any..
*/
void (*pm_idle)(void);
-#if
defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
+#if
def CONFIG_APM_MODULE
EXPORT_SYMBOL(pm_idle);
#endif
EXPORT_SYMBOL(pm_idle);
#endif
@@
-399,7
+399,7
@@
void default_idle(void)
cpu_relax();
}
}
cpu_relax();
}
}
-#if
defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
+#if
def CONFIG_APM_MODULE
EXPORT_SYMBOL(default_idle);
#endif
EXPORT_SYMBOL(default_idle);
#endif
@@
-642,7
+642,7
@@
static int __init idle_setup(char *str)
boot_option_idle_override = IDLE_POLL;
} else if (!strcmp(str, "mwait")) {
boot_option_idle_override = IDLE_FORCE_MWAIT;
boot_option_idle_override = IDLE_POLL;
} else if (!strcmp(str, "mwait")) {
boot_option_idle_override = IDLE_FORCE_MWAIT;
- WARN_ONCE(1, "\
idle=mwait\" will be removed in 2012\"
\n");
+ WARN_ONCE(1, "\
"idle=mwait\" will be removed in 2012
\n");
} else if (!strcmp(str, "halt")) {
/*
* When the boot option of idle=halt is added, halt is
} else if (!strcmp(str, "halt")) {
/*
* When the boot option of idle=halt is added, halt is