git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
sysfs.c
diff --git
a/arch/powerpc/kernel/sysfs.c
b/arch/powerpc/kernel/sysfs.c
index
0104350
..
406f308
100644
(file)
--- a/
arch/powerpc/kernel/sysfs.c
+++ b/
arch/powerpc/kernel/sysfs.c
@@
-60,7
+60,7
@@
static int smt_snooze_cmdline;
static int __init smt_setup(void)
{
struct device_node *options;
static int __init smt_setup(void)
{
struct device_node *options;
- unsigned int *val;
+
const
unsigned int *val;
unsigned int cpu;
if (!cpu_has_feature(CPU_FTR_SMT))
unsigned int cpu;
if (!cpu_has_feature(CPU_FTR_SMT))
@@
-70,8
+70,7
@@
static int __init smt_setup(void)
if (!options)
return -ENODEV;
if (!options)
return -ENODEV;
- val = (unsigned int *)get_property(options, "ibm,smt-snooze-delay",
- NULL);
+ val = get_property(options, "ibm,smt-snooze-delay", NULL);
if (!smt_snooze_cmdline && val) {
for_each_possible_cpu(cpu)
per_cpu(smt_snooze_delay, cpu) = *val;
if (!smt_snooze_cmdline && val) {
for_each_possible_cpu(cpu)
per_cpu(smt_snooze_delay, cpu) = *val;
@@
-231,7
+230,7
@@
static void register_cpu_online(unsigned int cpu)
if (cur_cpu_spec->num_pmcs >= 8)
sysdev_create_file(s, &attr_pmc8);
if (cur_cpu_spec->num_pmcs >= 8)
sysdev_create_file(s, &attr_pmc8);
- if (cpu_has_feature(CPU_FTR_
SMT
))
+ if (cpu_has_feature(CPU_FTR_
PURR
))
sysdev_create_file(s, &attr_purr);
}
sysdev_create_file(s, &attr_purr);
}
@@
-273,12
+272,12
@@
static void unregister_cpu_online(unsigned int cpu)
if (cur_cpu_spec->num_pmcs >= 8)
sysdev_remove_file(s, &attr_pmc8);
if (cur_cpu_spec->num_pmcs >= 8)
sysdev_remove_file(s, &attr_pmc8);
- if (cpu_has_feature(CPU_FTR_
SMT
))
+ if (cpu_has_feature(CPU_FTR_
PURR
))
sysdev_remove_file(s, &attr_purr);
}
#endif /* CONFIG_HOTPLUG_CPU */
sysdev_remove_file(s, &attr_purr);
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int __
dev
init sysfs_cpu_notify(struct notifier_block *self,
+static int __
cpu
init sysfs_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)(long)hcpu;
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)(long)hcpu;
@@
-296,7
+295,7
@@
static int __devinit sysfs_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
return NOTIFY_OK;
}
-static struct notifier_block __
dev
initdata sysfs_cpu_nb = {
+static struct notifier_block __
cpu
initdata sysfs_cpu_nb = {
.notifier_call = sysfs_cpu_notify,
};
.notifier_call = sysfs_cpu_notify,
};