From 7d90308f7ed0b9115d89653605d6870ef3387419 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 20 Apr 2012 13:05:50 +0000
Subject: [PATCH] --- yaml --- r: 302779 b: refs/heads/master c:
 84ec6d5796e095e2f8698bd2b5d33849ed26d9e2 h: refs/heads/master i:   302777:
 0ff14a1bcee13c2fe6808f631015116e300e7fc2   302775:
 ef334eb3b453ff6259245763e3a05ff6a1a4da66 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/arm/Kconfig           |  1 +
 trunk/arch/arm/include/asm/cpu.h |  1 -
 trunk/arch/arm/kernel/smp.c      | 26 +-------------------------
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 656647a233eb..6745c7591cc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13583bf15eb1e890e03d46b6f2753e4b64af21c9
+refs/heads/master: 84ec6d5796e095e2f8698bd2b5d33849ed26d9e2
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index cf006d40342c..cb253ce218a0 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -34,6 +34,7 @@ config ARM
 	select CPU_PM if (SUSPEND || CPU_IDLE)
 	select GENERIC_PCI_IOMAP
 	select HAVE_BPF_JIT if NET
+	select GENERIC_SMP_IDLE_THREAD
 	help
 	  The ARM series is a line of low-power-consumption RISC chip designs
 	  licensed by ARM Ltd and targeted at embedded applications and
diff --git a/trunk/arch/arm/include/asm/cpu.h b/trunk/arch/arm/include/asm/cpu.h
index 793968173bef..d797223b39d5 100644
--- a/trunk/arch/arm/include/asm/cpu.h
+++ b/trunk/arch/arm/include/asm/cpu.h
@@ -16,7 +16,6 @@
 struct cpuinfo_arm {
 	struct cpu	cpu;
 #ifdef CONFIG_SMP
-	struct task_struct *idle;
 	unsigned int	loops_per_jiffy;
 #endif
 };
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index f0e2cbbd837d..5e86f7c47824 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/arch/arm/kernel/smp.c
@@ -60,31 +60,10 @@ enum ipi_msg_type {
 
 static DECLARE_COMPLETION(cpu_running);
 
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
 {
-	struct cpuinfo_arm *ci = &per_cpu(cpu_data, cpu);
-	struct task_struct *idle = ci->idle;
 	int ret;
 
-	/*
-	 * Spawn a new process manually, if not already done.
-	 * Grab a pointer to its task struct so we can mess with it
-	 */
-	if (!idle) {
-		idle = fork_idle(cpu);
-		if (IS_ERR(idle)) {
-			printk(KERN_ERR "CPU%u: fork() failed\n", cpu);
-			return PTR_ERR(idle);
-		}
-		ci->idle = idle;
-	} else {
-		/*
-		 * Since this idle thread is being re-used, call
-		 * init_idle() to reinitialize the thread structure.
-		 */
-		init_idle(idle, cpu);
-	}
-
 	/*
 	 * We need to tell the secondary core where to find
 	 * its stack and the page tables.
@@ -318,9 +297,6 @@ void __init smp_cpus_done(unsigned int max_cpus)
 
 void __init smp_prepare_boot_cpu(void)
 {
-	unsigned int cpu = smp_processor_id();
-
-	per_cpu(cpu_data, cpu).idle = current;
 }
 
 void __init smp_prepare_cpus(unsigned int max_cpus)