* [PATCH] Move cpu hotplug driver lock from pseries to powerpc
@ 2010-01-14 19:52 Nathan Fontenot
2010-01-14 23:39 ` Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: Nathan Fontenot @ 2010-01-14 19:52 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Andreas Schwab
Move the defintion and lock helper routines for the cpu hotplug driver
lock from pseries to powerpc code to avoid build breaks for platforms
other than pseries that use cpu hotplug.
Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
---
arch/powerpc/kernel/smp.c | 12 ++++++++++++
arch/powerpc/platforms/pseries/dlpar.c | 12 ------------
2 files changed, 12 insertions(+), 12 deletions(-)
Index: powerpc/arch/powerpc/kernel/smp.c
===================================================================
--- powerpc.orig/arch/powerpc/kernel/smp.c 2010-01-11 12:19:06.000000000 -0600
+++ powerpc/arch/powerpc/kernel/smp.c 2010-01-14 09:44:35.000000000 -0600
@@ -619,4 +619,16 @@
if (smp_ops->cpu_die)
smp_ops->cpu_die(cpu);
}
+
+static DEFINE_MUTEX(powerpc_cpu_hotplug_driver_mutex);
+
+void cpu_hotplug_driver_lock()
+{
+ mutex_lock(&powerpc_cpu_hotplug_driver_mutex);
+}
+
+void cpu_hotplug_driver_unlock()
+{
+ mutex_unlock(&powerpc_cpu_hotplug_driver_mutex);
+}
#endif
Index: powerpc/arch/powerpc/platforms/pseries/dlpar.c
===================================================================
--- powerpc.orig/arch/powerpc/platforms/pseries/dlpar.c 2010-01-14 09:37:48.000000000 -0600
+++ powerpc/arch/powerpc/platforms/pseries/dlpar.c 2010-01-14 09:42:50.000000000 -0600
@@ -344,18 +344,6 @@
#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
-static DEFINE_MUTEX(pseries_cpu_hotplug_mutex);
-
-void cpu_hotplug_driver_lock()
-{
- mutex_lock(&pseries_cpu_hotplug_mutex);
-}
-
-void cpu_hotplug_driver_unlock()
-{
- mutex_unlock(&pseries_cpu_hotplug_mutex);
-}
-
static int dlpar_online_cpu(struct device_node *dn)
{
int rc = 0;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Move cpu hotplug driver lock from pseries to powerpc
2010-01-14 19:52 [PATCH] Move cpu hotplug driver lock from pseries to powerpc Nathan Fontenot
@ 2010-01-14 23:39 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2010-01-14 23:39 UTC (permalink / raw)
To: Nathan Fontenot; +Cc: linuxppc-dev, Andreas Schwab
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
On Thu, 2010-01-14 at 13:52 -0600, Nathan Fontenot wrote:
> Move the defintion and lock helper routines for the cpu hotplug driver
> lock from pseries to powerpc code to avoid build breaks for platforms
> other than pseries that use cpu hotplug.
>
> Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
> ---
> arch/powerpc/kernel/smp.c | 12 ++++++++++++
> arch/powerpc/platforms/pseries/dlpar.c | 12 ------------
> 2 files changed, 12 insertions(+), 12 deletions(-)
Much nicer :)
Acked-by: Michael Ellerman <michael@ellerman.id.au>
cheers
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-14 23:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-14 19:52 [PATCH] Move cpu hotplug driver lock from pseries to powerpc Nathan Fontenot
2010-01-14 23:39 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).