From: Randy Dunlap <[email protected]>
Replace ARCH_HAS_SCHED_WAKE_IDLE with CONFIG_SCHED_SMT.
Move it from header files to Kconfig space.
Signed-off-by: Randy Dunlap <[email protected]>
---
include/linux/topology.h | 6 ++----
kernel/sched.c | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
--- linux-2618-rc4-arch.orig/include/linux/topology.h
+++ linux-2618-rc4-arch/include/linux/topology.h
@@ -80,10 +80,8 @@
* and allow arch-specific performance tuning of sched_domains.
*/
#ifdef CONFIG_SCHED_SMT
-/* MCD - Do we really need this? It is always on if CONFIG_SCHED_SMT is,
- * so can't we drop this in favor of CONFIG_SCHED_SMT?
- */
-#define ARCH_HAS_SCHED_WAKE_IDLE
+/* CONFIG_SCHED_SMT is synonymous with old ARCH_HAS_SCHED_WAKE_IDLE */
+
/* Common values for SMT siblings */
#ifndef SD_SIBLING_INIT
#define SD_SIBLING_INIT (struct sched_domain) { \
--- linux-2618-rc4-arch.orig/kernel/sched.c
+++ linux-2618-rc4-arch/kernel/sched.c
@@ -1315,7 +1315,7 @@ nextlevel:
*
* Returns the CPU we should wake onto.
*/
-#if defined(ARCH_HAS_SCHED_WAKE_IDLE)
+#ifdef CONFIG_SCHED_SMT
static int wake_idle(int cpu, struct task_struct *p)
{
cpumask_t tmp;
---