From 31cc36844f025aea1583ad8c441ce69701d52f95 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 20 Apr 2012 13:05:51 +0000 Subject: [PATCH] --- yaml --- r: 302781 b: refs/heads/master c: 3b0132ce4fff68b30abdfcb74cffc283af711076 h: refs/heads/master i: 302779: 7d90308f7ed0b9115d89653605d6870ef3387419 v: v3 --- [refs] | 2 +- trunk/arch/hexagon/Kconfig | 1 + trunk/arch/hexagon/kernel/smp.c | 11 ++--------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d6db89c5341f..5ebc6cdc9874 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 360014a36170464ebd9935514f0e0e3d558b0e56 +refs/heads/master: 3b0132ce4fff68b30abdfcb74cffc283af711076 diff --git a/trunk/arch/hexagon/Kconfig b/trunk/arch/hexagon/Kconfig index 9059e3905887..d2e4a3330336 100644 --- a/trunk/arch/hexagon/Kconfig +++ b/trunk/arch/hexagon/Kconfig @@ -27,6 +27,7 @@ config HEXAGON select HAVE_ARCH_TRACEHOOK select NO_IOPORT select GENERIC_IOMAP + select GENERIC_SMP_IDLE_THREAD # mostly generic routines, with some accelerated ones ---help--- Qualcomm Hexagon is a processor architecture designed for high diff --git a/trunk/arch/hexagon/kernel/smp.c b/trunk/arch/hexagon/kernel/smp.c index 93e77e2b17a8..f7264621e58d 100644 --- a/trunk/arch/hexagon/kernel/smp.c +++ b/trunk/arch/hexagon/kernel/smp.c @@ -196,18 +196,11 @@ void __cpuinit start_secondary(void) * maintains control until "cpu_online(cpu)" is set. */ -int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle) +int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle) { - struct task_struct *idle; - struct thread_info *thread; + struct thread_info *thread = (struct thread_info *)idle->stack; void *stack_start; - /* Create new init task for the CPU */ - idle = fork_idle(cpu); - if (IS_ERR(idle)) - panic(KERN_ERR "fork_idle failed\n"); - - thread = (struct thread_info *)idle->stack; thread->cpu = cpu; /* Boot to the head. */