projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
[cascardo/linux.git]
/
drivers
/
cpufreq
/
cpufreq_stats.c
diff --git
a/drivers/cpufreq/cpufreq_stats.c
b/drivers/cpufreq/cpufreq_stats.c
index
d37568c
..
04452f0
100644
(file)
--- a/
drivers/cpufreq/cpufreq_stats.c
+++ b/
drivers/cpufreq/cpufreq_stats.c
@@
-9,17
+9,10
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#include <linux/kernel.h>
-#include <linux/slab.h>
#include <linux/cpu.h>
#include <linux/cpu.h>
-#include <linux/sysfs.h>
#include <linux/cpufreq.h>
#include <linux/module.h>
#include <linux/cpufreq.h>
#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/percpu.h>
-#include <linux/kobject.h>
-#include <linux/spinlock.h>
-#include <linux/notifier.h>
+#include <linux/slab.h>
#include <asm/cputime.h>
static spinlock_t cpufreq_stats_lock;
#include <asm/cputime.h>
static spinlock_t cpufreq_stats_lock;
@@
-200,22
+193,22
@@
static int cpufreq_stats_create_table(struct cpufreq_policy *policy,
{
unsigned int i, j, count = 0, ret = 0;
struct cpufreq_stats *stat;
{
unsigned int i, j, count = 0, ret = 0;
struct cpufreq_stats *stat;
- struct cpufreq_policy *
data
;
+ struct cpufreq_policy *
current_policy
;
unsigned int alloc_size;
unsigned int cpu = policy->cpu;
if (per_cpu(cpufreq_stats_table, cpu))
return -EBUSY;
unsigned int alloc_size;
unsigned int cpu = policy->cpu;
if (per_cpu(cpufreq_stats_table, cpu))
return -EBUSY;
- stat = kzalloc(sizeof(
struct cpufreq_stats
), GFP_KERNEL);
+ stat = kzalloc(sizeof(
*stat
), GFP_KERNEL);
if ((stat) == NULL)
return -ENOMEM;
if ((stat) == NULL)
return -ENOMEM;
-
data
= cpufreq_cpu_get(cpu);
- if (
data
== NULL) {
+
current_policy
= cpufreq_cpu_get(cpu);
+ if (
current_policy
== NULL) {
ret = -EINVAL;
goto error_get_fail;
}
ret = -EINVAL;
goto error_get_fail;
}
- ret = sysfs_create_group(&
data
->kobj, &stats_attr_group);
+ ret = sysfs_create_group(&
current_policy
->kobj, &stats_attr_group);
if (ret)
goto error_out;
if (ret)
goto error_out;
@@
-258,10
+251,10
@@
static int cpufreq_stats_create_table(struct cpufreq_policy *policy,
stat->last_time = get_jiffies_64();
stat->last_index = freq_table_get_index(stat, policy->cur);
spin_unlock(&cpufreq_stats_lock);
stat->last_time = get_jiffies_64();
stat->last_index = freq_table_get_index(stat, policy->cur);
spin_unlock(&cpufreq_stats_lock);
- cpufreq_cpu_put(
data
);
+ cpufreq_cpu_put(
current_policy
);
return 0;
error_out:
return 0;
error_out:
- cpufreq_cpu_put(
data
);
+ cpufreq_cpu_put(
current_policy
);
error_get_fail:
kfree(stat);
per_cpu(cpufreq_stats_table, cpu) = NULL;
error_get_fail:
kfree(stat);
per_cpu(cpufreq_stats_table, cpu) = NULL;
@@
-348,16
+341,10
@@
static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
unsigned int cpu = (unsigned long)hcpu;
switch (action) {
unsigned int cpu = (unsigned long)hcpu;
switch (action) {
- case CPU_ONLINE:
- case CPU_ONLINE_FROZEN:
- cpufreq_update_policy(cpu);
- break;
case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE:
- case CPU_DOWN_PREPARE_FROZEN:
cpufreq_stats_free_sysfs(cpu);
break;
case CPU_DEAD:
cpufreq_stats_free_sysfs(cpu);
break;
case CPU_DEAD:
- case CPU_DEAD_FROZEN:
cpufreq_stats_free_table(cpu);
break;
}
cpufreq_stats_free_table(cpu);
break;
}
@@
-390,8
+377,6
@@
static int __init cpufreq_stats_init(void)
return ret;
register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
return ret;
register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
- for_each_online_cpu(cpu)
- cpufreq_update_policy(cpu);
ret = cpufreq_register_notifier(¬ifier_trans_block,
CPUFREQ_TRANSITION_NOTIFIER);
ret = cpufreq_register_notifier(¬ifier_trans_block,
CPUFREQ_TRANSITION_NOTIFIER);