[CPUFREQ] cpufreq_stats: misc cpuinit section annotations
* Stop referencing the callback directly from the __init and __exit functions of this driver, and instead explicitly call cpufreq_update_policy() et al. This enables the callback function to be marked as __cpuinit (and the notifier_block __cpuinitdata), thereby saving space when HOTPLUG_CPU=n. This also enables us to use other tricks to replace __cpuinit{data} in future. * cpufreq_stats_free_table() is only called from __cpuinit or __exit marked functions, making it an ideal candidate for __cpuexit. * Fix missing space in the module description Signed-off-by: Satyam Sharma <satyam@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Jones <davej@redhat.com>
This commit is contained in:
committed by
Dave Jones
parent
6070b5de50
commit
55395ae72b
@@ -164,8 +164,7 @@ freq_table_get_index(struct cpufreq_stats *stat, unsigned int freq)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void __cpuexit cpufreq_stats_free_table(unsigned int cpu)
|
||||||
cpufreq_stats_free_table (unsigned int cpu)
|
|
||||||
{
|
{
|
||||||
struct cpufreq_stats *stat = cpufreq_stats_table[cpu];
|
struct cpufreq_stats *stat = cpufreq_stats_table[cpu];
|
||||||
struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
|
struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
|
||||||
@@ -305,8 +304,9 @@ cpufreq_stat_notifier_trans (struct notifier_block *nb, unsigned long val,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
|
static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
|
||||||
unsigned long action, void *hcpu)
|
unsigned long action,
|
||||||
|
void *hcpu)
|
||||||
{
|
{
|
||||||
unsigned int cpu = (unsigned long)hcpu;
|
unsigned int cpu = (unsigned long)hcpu;
|
||||||
|
|
||||||
@@ -323,7 +323,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
|
|||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct notifier_block cpufreq_stat_cpu_notifier =
|
static struct notifier_block cpufreq_stat_cpu_notifier __cpuinitdata =
|
||||||
{
|
{
|
||||||
.notifier_call = cpufreq_stat_cpu_callback,
|
.notifier_call = cpufreq_stat_cpu_callback,
|
||||||
};
|
};
|
||||||
@@ -356,8 +356,7 @@ __init cpufreq_stats_init(void)
|
|||||||
|
|
||||||
register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
|
register_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
|
||||||
for_each_online_cpu(cpu) {
|
for_each_online_cpu(cpu) {
|
||||||
cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier,
|
cpufreq_update_policy(cpu);
|
||||||
CPU_ONLINE, (void *)(long)cpu);
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -372,13 +371,12 @@ __exit cpufreq_stats_exit(void)
|
|||||||
CPUFREQ_TRANSITION_NOTIFIER);
|
CPUFREQ_TRANSITION_NOTIFIER);
|
||||||
unregister_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
|
unregister_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
|
||||||
for_each_online_cpu(cpu) {
|
for_each_online_cpu(cpu) {
|
||||||
cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier,
|
cpufreq_stats_free_table(cpu);
|
||||||
CPU_DEAD, (void *)(long)cpu);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MODULE_AUTHOR ("Zou Nan hai <nanhai.zou@intel.com>");
|
MODULE_AUTHOR ("Zou Nan hai <nanhai.zou@intel.com>");
|
||||||
MODULE_DESCRIPTION ("'cpufreq_stats' - A driver to export cpufreq stats"
|
MODULE_DESCRIPTION ("'cpufreq_stats' - A driver to export cpufreq stats "
|
||||||
"through sysfs filesystem");
|
"through sysfs filesystem");
|
||||||
MODULE_LICENSE ("GPL");
|
MODULE_LICENSE ("GPL");
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user