git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Fix link errors when EEH is disabled
[safe/jmp/linux-2.6]
/
arch
/
powerpc
/
platforms
/
pseries
/
hotplug-cpu.c
diff --git
a/arch/powerpc/platforms/pseries/hotplug-cpu.c
b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index
e78e8ac
..
f460b9c
100644
(file)
--- a/
arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/
arch/powerpc/platforms/pseries/hotplug-cpu.c
@@
-53,7
+53,7
@@
static void rtas_stop_self(void)
panic("Alas, I survived.\n");
}
panic("Alas, I survived.\n");
}
-static void p
S
eries_mach_cpu_die(void)
+static void p
s
eries_mach_cpu_die(void)
{
local_irq_disable();
idle_task_exit();
{
local_irq_disable();
idle_task_exit();
@@
-88,7
+88,7
@@
static int query_cpu_stopped(unsigned int pcpu)
return cpu_status;
}
return cpu_status;
}
-static int p
S
eries_cpu_disable(void)
+static int p
s
eries_cpu_disable(void)
{
int cpu = smp_processor_id();
{
int cpu = smp_processor_id();
@@
-104,7
+104,7
@@
static int pSeries_cpu_disable(void)
return 0;
}
return 0;
}
-static void p
S
eries_cpu_die(unsigned int cpu)
+static void p
s
eries_cpu_die(unsigned int cpu)
{
int tries;
int cpu_status;
{
int tries;
int cpu_status;
@@
-136,7
+136,7
@@
static void pSeries_cpu_die(unsigned int cpu)
* the logical ids for sibling SMT threads x and y are adjacent, such
* that x^1 == y and y^1 == x.
*/
* the logical ids for sibling SMT threads x and y are adjacent, such
* that x^1 == y and y^1 == x.
*/
-static int p
S
eries_add_processor(struct device_node *np)
+static int p
s
eries_add_processor(struct device_node *np)
{
unsigned int cpu;
cpumask_t candidate_map, tmp = CPU_MASK_NONE;
{
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.
*/
* the hard id in the paca(s) to -1 to be consistent with boot time
* convention for non-present cpus.
*/
-static void p
S
eries_remove_processor(struct device_node *np)
+static void p
s
eries_remove_processor(struct device_node *np)
{
unsigned int cpu;
int len, nthreads, i;
{
unsigned int cpu;
int len, nthreads, i;
@@
-226,17
+226,18
@@
static void pSeries_remove_processor(struct device_node *np)
unlock_cpu_hotplug();
}
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:
{
int err = NOTIFY_OK;
switch (action) {
case PSERIES_RECONFIG_ADD:
- if (p
S
eries_add_processor(node))
+ if (p
s
eries_add_processor(node))
err = NOTIFY_BAD;
break;
case PSERIES_RECONFIG_REMOVE:
err = NOTIFY_BAD;
break;
case PSERIES_RECONFIG_REMOVE:
- p
S
eries_remove_processor(node);
+ p
s
eries_remove_processor(node);
break;
default:
err = NOTIFY_DONE;
break;
default:
err = NOTIFY_DONE;
@@
-245,8
+246,8
@@
static int pSeries_smp_notifier(struct notifier_block *nb, unsigned long action,
return err;
}
return err;
}
-static struct notifier_block p
S
eries_smp_nb = {
- .notifier_call = p
S
eries_smp_notifier,
+static struct notifier_block p
s
eries_smp_nb = {
+ .notifier_call = p
s
eries_smp_notifier,
};
static int __init pseries_cpu_hotplug_init(void)
};
static int __init pseries_cpu_hotplug_init(void)
@@
-261,13
+262,13
@@
static int __init pseries_cpu_hotplug_init(void)
return 0;
}
return 0;
}
- ppc_md.cpu_die = p
S
eries_mach_cpu_die;
- smp_ops->cpu_disable = p
S
eries_cpu_disable;
- smp_ops->cpu_die = p
S
eries_cpu_die;
+ ppc_md.cpu_die = p
s
eries_mach_cpu_die;
+ smp_ops->cpu_disable = p
s
eries_cpu_disable;
+ smp_ops->cpu_die = p
s
eries_cpu_die;
/* Processors can be added/removed only on LPAR */
if (firmware_has_feature(FW_FEATURE_LPAR))
/* Processors can be added/removed only on LPAR */
if (firmware_has_feature(FW_FEATURE_LPAR))
- pSeries_reconfig_notifier_register(&p
S
eries_smp_nb);
+ pSeries_reconfig_notifier_register(&p
s
eries_smp_nb);
return 0;
}
return 0;
}