projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[powerpc.git]
/
arch
/
powerpc
/
kernel
/
sysfs.c
diff --git
a/arch/powerpc/kernel/sysfs.c
b/arch/powerpc/kernel/sysfs.c
index
fec228c
..
d45a168
100644
(file)
--- a/
arch/powerpc/kernel/sysfs.c
+++ b/
arch/powerpc/kernel/sysfs.c
@@
-25,8
+25,8
@@
static DEFINE_PER_CPU(struct cpu, cpu_devices);
/* SMT stuff */
#ifdef CONFIG_PPC_MULTIPLATFORM
/* SMT stuff */
#ifdef CONFIG_PPC_MULTIPLATFORM
-/*
default to snooze disabled
*/
-DEFINE_PER_CPU(unsigned long, smt_snooze_delay);
+/*
Time in microseconds we delay before sleeping in the idle loop
*/
+DEFINE_PER_CPU(unsigned long, smt_snooze_delay)
= { 100 }
;
static ssize_t store_smt_snooze_delay(struct sys_device *dev, const char *buf,
size_t count)
static ssize_t store_smt_snooze_delay(struct sys_device *dev, const char *buf,
size_t count)
@@
-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,7
+272,7
@@
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 */