aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/salinfo.c
diff options
context:
space:
mode:
authorSatyam Sharma <satyam@infradead.org>2007-10-02 16:39:45 -0400
committerTony Luck <tony.luck@intel.com>2007-10-12 17:13:38 -0400
commitdb6a5cef7f474a5bad476a31f4e4c69a69fab8b1 (patch)
tree9f27269dd89c0e88a5bf9396fd124cc22de27983 /arch/ia64/kernel/salinfo.c
parent782e3b3b3804c38d5130c7f21d7ec7bf6709023f (diff)
[IA64] tree-wide: Misc __cpu{initdata, init, exit} annotations
* palinfo.c: palinfo_cpu_notifier is a CPU hotplug notifier_block, and can be marked __cpuinitdata, and the callback function palinfo_cpu_callback() itself can be marked __cpuinit. create_palinfo_proc_entries() is only called from __cpuinit callback or general __init code, therefore a candidate for __cpuinit itself. remove_palinfo_proc_entries() is only called from __cpuinit callback or general __exit code, therefore a candidate for __cpuexit. * salinfo.c: The CPU hotplug notifier_block can be __cpuinitdata. The callback salinfo_cpu_callback() is incorrectly marked __devinit -- it must be __cpuinit instead. * topology.c: cache_sysfs_init() is only called at device_initcall() time so marking it as __cpuinit is wrong and wasteful. It should be unconditionally __init. Also cleanup reference to hotplug notifier callback function from this function and replace with cache_add_dev(), which could also enable us to use other tricks to replace __cpuinit{data} annotations, as recently discussed on this list. cache_shared_cpu_map_setup() is only ever called from __cpuinit-marked functions hence both its definitions (SMP or !SMP) are candidates for __cpuinit itself. Also all_cpu_cache_info can be __cpuinitdata because only referenced from __cpuinit code. Signed-off-by: Satyam Sharma <satyam@infradead.org> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
-rw-r--r--arch/ia64/kernel/salinfo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 25cd75f50ab1..779c3cca206c 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -574,7 +574,7 @@ static const struct file_operations salinfo_data_fops = {
574 .write = salinfo_log_write, 574 .write = salinfo_log_write,
575}; 575};
576 576
577static int __devinit 577static int __cpuinit
578salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) 578salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
579{ 579{
580 unsigned int i, cpu = (unsigned long)hcpu; 580 unsigned int i, cpu = (unsigned long)hcpu;
@@ -615,7 +615,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
615 return NOTIFY_OK; 615 return NOTIFY_OK;
616} 616}
617 617
618static struct notifier_block salinfo_cpu_notifier = 618static struct notifier_block salinfo_cpu_notifier __cpuinitdata =
619{ 619{
620 .notifier_call = salinfo_cpu_callback, 620 .notifier_call = salinfo_cpu_callback,
621 .priority = 0, 621 .priority = 0,