[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120601091519.31979.57333.stgit@srivatsabhat.in.ibm.com>
Date: Fri, 01 Jun 2012 14:45:24 +0530
From: "Srivatsa S. Bhat" <srivatsa.bhat@...ux.vnet.ibm.com>
To: tglx@...utronix.de, peterz@...radead.org,
paulmck@...ux.vnet.ibm.com
Cc: rusty@...tcorp.com.au, mingo@...nel.org, yong.zhang0@...il.com,
akpm@...ux-foundation.org, vatsa@...ux.vnet.ibm.com, rjw@...k.pl,
linux-arch@...r.kernel.org, linux-kernel@...r.kernel.org,
srivatsa.bhat@...ux.vnet.ibm.com, nikunj@...ux.vnet.ibm.com,
"Nikunj A. Dadhania" <nikunj@...ux.vnet.ibm.com>,
Jeff Dike <jdike@...toit.com>,
Richard Weinberger <richard@....at>,
"David S. Miller" <davem@...emloft.net>,
Rusty Russell <rusty@...tcorp.com.au>,
Chris Metcalf <cmetcalf@...era.com>,
Thomas Gleixner <tglx@...utronix.de>,
user-mode-linux-devel@...ts.sourceforge.net,
user-mode-linux-user@...ts.sourceforge.net
Subject: [PATCH 22/27] um, smpboot: Use generic SMP booting infrastructure
From: Nikunj A. Dadhania <nikunj@...ux.vnet.ibm.com>
Convert um to use the generic framework to boot secondary CPUs.
Notes:
1. Removed call to default_idle() in idle_proc(). The generic framework will
invoke cpu_idle().
2. The generic code will call preempt_disable() and local_irq_enable() which
weren't originally present in idle_proc().
Signed-off-by: Nikunj A. Dadhania <nikunj@...ux.vnet.ibm.com>
Cc: Jeff Dike <jdike@...toit.com>
Cc: Richard Weinberger <richard@....at>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: Rusty Russell <rusty@...tcorp.com.au>
Cc: Chris Metcalf <cmetcalf@...era.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: user-mode-linux-devel@...ts.sourceforge.net
Cc: user-mode-linux-user@...ts.sourceforge.net
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@...ux.vnet.ibm.com>
---
arch/um/kernel/smp.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index a02b7e9..6cffcf4 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -10,6 +10,7 @@
#ifdef CONFIG_SMP
#include "linux/sched.h"
+#include "linux/smpboot.h"
#include "linux/module.h"
#include "linux/threads.h"
#include "linux/interrupt.h"
@@ -58,6 +59,12 @@ static cpumask_t cpu_callin_map = CPU_MASK_NONE;
static int idle_proc(void *cpup)
{
+ smpboot_start_secondary(cpup);
+ return 0;
+}
+
+void __cpuinit __cpu_pre_starting(void *unused)
+{
int cpu = (int) cpup, err;
err = os_pipe(cpu_data[cpu].ipi_pipe, 1, 1);
@@ -74,11 +81,6 @@ static int idle_proc(void *cpup)
while (!cpu_isset(cpu, smp_commenced_mask))
cpu_relax();
-
- notify_cpu_starting(cpu);
- set_cpu_online(cpu, true);
- default_idle();
- return 0;
}
static struct task_struct *idle_thread(int cpu)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists