From 04e906af49ecac75274f882c9415a2b4870ed477 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 20 Apr 2012 13:05:53 +0000
Subject: [PATCH] --- yaml --- r: 302783 b: refs/heads/master c:
 a4cfc31da34eacafd9f6b16e149448bf0ef6d0b2 h: refs/heads/master i:   302781:
 31cc36844f025aea1583ad8c441ce69701d52f95   302779:
 7d90308f7ed0b9115d89653605d6870ef3387419   302775:
 ef334eb3b453ff6259245763e3a05ff6a1a4da66   302767:
 dc1661a093b484bf2eaa09f362b212cd55ab7cc5   302751:
 5e2f5f12ee05f99f2ac909feae2077b64d6fb607   302719:
 04fb773c861b88c69f43c8b774728f1a19cdfed0 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/cris/Kconfig               |  1 +
 trunk/arch/cris/arch-v32/kernel/smp.c | 12 ++----------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d31a58d94716..01e066de7abc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80e7813cd772cf30597024b371e73df9736de8d
+refs/heads/master: a4cfc31da34eacafd9f6b16e149448bf0ef6d0b2
diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
index b3abfb08aa5c..2995035812ec 100644
--- a/trunk/arch/cris/Kconfig
+++ b/trunk/arch/cris/Kconfig
@@ -49,6 +49,7 @@ config CRIS
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_SHOW
 	select GENERIC_IOMAP
+	select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
 
 config HZ
 	int
diff --git a/trunk/arch/cris/arch-v32/kernel/smp.c b/trunk/arch/cris/arch-v32/kernel/smp.c
index 125ee2d7bc87..ebe2cb30bd11 100644
--- a/trunk/arch/cris/arch-v32/kernel/smp.c
+++ b/trunk/arch/cris/arch-v32/kernel/smp.c
@@ -108,17 +108,12 @@ void __init smp_cpus_done(unsigned int max_cpus)
 
 /* Bring one cpu online.*/
 static int __init
-smp_boot_one_cpu(int cpuid)
+smp_boot_one_cpu(int cpuid, struct task_struct idle)
 {
 	unsigned timeout;
-	struct task_struct *idle;
 	cpumask_t cpu_mask;
 
 	cpumask_clear(&cpu_mask);
-	idle = fork_idle(cpuid);
-	if (IS_ERR(idle))
-		panic("SMP: fork failed for CPU:%d", cpuid);
-
 	task_thread_info(idle)->cpu = cpuid;
 
 	/* Information to the CPU that is about to boot */
@@ -142,9 +137,6 @@ smp_boot_one_cpu(int cpuid)
 		barrier();
 	}
 
-	put_task_struct(idle);
-	idle = NULL;
-
 	printk(KERN_CRIT "SMP: CPU:%d is stuck.\n", cpuid);
 	return -1;
 }
@@ -209,7 +201,7 @@ unsigned long cache_decay_ticks = 1;
 
 int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
 {
-	smp_boot_one_cpu(cpu);
+	smp_boot_one_cpu(cpu, tidle);
 	return cpu_online(cpu) ? 0 : -ENOSYS;
 }