From: Michael Ellerman <michael@ellerman.id.au>
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH 5/5] Cleanup pass over platforms/pseries/hotplug-cpu.c
Date: Tue, 05 Dec 2006 17:52:39 +1100 [thread overview]
Message-ID: <20061205065237.9F25C67C01@ozlabs.org> (raw)
In-Reply-To: <1165301556.843426.760217571714.qpush@cradle>
Purely cosmetic. Change pSeries to pseries inline with other parts of the
kernel, and fix an overly long line.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/platforms/pseries/hotplug-cpu.c | 29 +++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
Index: powerpc/arch/powerpc/platforms/pseries/hotplug-cpu.c
===================================================================
--- powerpc.orig/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ powerpc/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -53,7 +53,7 @@ static void rtas_stop_self(void)
panic("Alas, I survived.\n");
}
-static void pSeries_mach_cpu_die(void)
+static void pseries_mach_cpu_die(void)
{
local_irq_disable();
idle_task_exit();
@@ -88,7 +88,7 @@ static int query_cpu_stopped(unsigned in
return cpu_status;
}
-static int pSeries_cpu_disable(void)
+static int pseries_cpu_disable(void)
{
int cpu = smp_processor_id();
@@ -104,7 +104,7 @@ static int pSeries_cpu_disable(void)
return 0;
}
-static void pSeries_cpu_die(unsigned int cpu)
+static void pseries_cpu_die(unsigned int cpu)
{
int tries;
int cpu_status;
@@ -136,7 +136,7 @@ static void pSeries_cpu_die(unsigned int
* the logical ids for sibling SMT threads x and y are adjacent, such
* that x^1 == y and y^1 == x.
*/
-static int pSeries_add_processor(struct device_node *np)
+static int pseries_add_processor(struct device_node *np)
{
unsigned int cpu;
cpumask_t candidate_map, tmp = CPU_MASK_NONE;
@@ -197,7 +197,7 @@ out_unlock:
* the hard id in the paca(s) to -1 to be consistent with boot time
* convention for non-present cpus.
*/
-static void pSeries_remove_processor(struct device_node *np)
+static void pseries_remove_processor(struct device_node *np)
{
unsigned int cpu;
int len, nthreads, i;
@@ -226,17 +226,18 @@ static void pSeries_remove_processor(str
unlock_cpu_hotplug();
}
-static int pSeries_smp_notifier(struct notifier_block *nb, unsigned long action, void *node)
+static int pseries_smp_notifier(struct notifier_block *nb,
+ unsigned long action, void *node)
{
int err = NOTIFY_OK;
switch (action) {
case PSERIES_RECONFIG_ADD:
- if (pSeries_add_processor(node))
+ if (pseries_add_processor(node))
err = NOTIFY_BAD;
break;
case PSERIES_RECONFIG_REMOVE:
- pSeries_remove_processor(node);
+ pseries_remove_processor(node);
break;
default:
err = NOTIFY_DONE;
@@ -245,8 +246,8 @@ static int pSeries_smp_notifier(struct n
return err;
}
-static struct notifier_block pSeries_smp_nb = {
- .notifier_call = pSeries_smp_notifier,
+static struct notifier_block pseries_smp_nb = {
+ .notifier_call = pseries_smp_notifier,
};
static int __init pseries_cpu_hotplug_init(void)
@@ -261,13 +262,13 @@ static int __init pseries_cpu_hotplug_in
return 0;
}
- ppc_md.cpu_die = pSeries_mach_cpu_die;
- smp_ops->cpu_disable = pSeries_cpu_disable;
- smp_ops->cpu_die = pSeries_cpu_die;
+ ppc_md.cpu_die = pseries_mach_cpu_die;
+ smp_ops->cpu_disable = pseries_cpu_disable;
+ smp_ops->cpu_die = pseries_cpu_die;
/* Processors can be added/removed only on LPAR */
if (firmware_has_feature(FW_FEATURE_LPAR))
- pSeries_reconfig_notifier_register(&pSeries_smp_nb);
+ pSeries_reconfig_notifier_register(&pseries_smp_nb);
return 0;
}
next prev parent reply other threads:[~2006-12-05 6:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-05 6:52 [PATCH 1/5] Move rtas_stop_self() into platforms/pseries/hotplug-cpu.c Michael Ellerman
2006-12-05 6:52 ` [PATCH 2/5] Move pSeries_mach_cpu_die() " Michael Ellerman
2006-12-05 6:52 ` [PATCH 4/5] Only enable cpu hotplug via RTAS if the required firmware support is found Michael Ellerman
2006-12-05 6:52 ` [PATCH 3/5] Move the rest of the hotplug cpu code into platforms/pseries/hotplug-cpu.c Michael Ellerman
2006-12-05 6:52 ` Michael Ellerman [this message]
2006-12-06 22:51 ` [PATCH 1/5] Move rtas_stop_self() " Linas Vepstas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061205065237.9F25C67C01@ozlabs.org \
--to=michael@ellerman.id.au \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).