On 11/11/2011 01:52 AM, Fenghua Yu wrote: > From: Fenghua Yu <fenghua.yu@xxxxxxxxx> > > Add __init for functions alloc_frozen_cpus() and cpu_hotplug_pm_sync_init() > because they are only called during boot time. > > Add static for function cpu_hotplug_pm_sync_init() because its scope is limited > in this file only. > > Signed-off-by: Fenghua Yu <fenghua.yu@xxxxxxxxx> > --- > kernel/cpu.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kernel/cpu.c b/kernel/cpu.c > index 563f136..cf915b8 100644 > --- a/kernel/cpu.c > +++ b/kernel/cpu.c > @@ -470,7 +470,7 @@ out: > cpu_maps_update_done(); > } > > -static int alloc_frozen_cpus(void) > +static int __init alloc_frozen_cpus(void) > { > if (!alloc_cpumask_var(&frozen_cpus, GFP_KERNEL|__GFP_ZERO)) > return -ENOMEM; > @@ -543,7 +543,7 @@ cpu_hotplug_pm_callback(struct notifier_block *nb, > } > > > -int cpu_hotplug_pm_sync_init(void) > +static int __init cpu_hotplug_pm_sync_init(void) > { > pm_notifier(cpu_hotplug_pm_callback, 0); pm_notifier() macro will declare a static variable. I agree this won't be any problem functionality-wise. But it doesn't seem elegant to say "throw away the function but keep the static variable". So, if you want to add __init qualifier to this function, I suggest that you declare the static variable outside the function, and call register_pm_notifier() in the function, just to ensure it doesn't obscure things. And please change the title, it talks about intel_thermal_interrupt()! Thanks, Srivatsa S. Bhat > return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html