Commit db6a5cef authored by Satyam Sharma's avatar Satyam Sharma Committed by Tony Luck

[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: default avatarSatyam Sharma <satyam@infradead.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 782e3b3b
...@@ -907,7 +907,7 @@ palinfo_read_entry(char *page, char **start, off_t off, int count, int *eof, voi ...@@ -907,7 +907,7 @@ palinfo_read_entry(char *page, char **start, off_t off, int count, int *eof, voi
return len; return len;
} }
static void static void __cpuinit
create_palinfo_proc_entries(unsigned int cpu) create_palinfo_proc_entries(unsigned int cpu)
{ {
# define CPUSTR "cpu%d" # define CPUSTR "cpu%d"
...@@ -968,7 +968,7 @@ remove_palinfo_proc_entries(unsigned int hcpu) ...@@ -968,7 +968,7 @@ remove_palinfo_proc_entries(unsigned int hcpu)
} }
} }
static int palinfo_cpu_callback(struct notifier_block *nfb, static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {
unsigned int hotcpu = (unsigned long)hcpu; unsigned int hotcpu = (unsigned long)hcpu;
...@@ -986,7 +986,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb, ...@@ -986,7 +986,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK; return NOTIFY_OK;
} }
static struct notifier_block palinfo_cpu_notifier = static struct notifier_block palinfo_cpu_notifier __cpuinitdata =
{ {
.notifier_call = palinfo_cpu_callback, .notifier_call = palinfo_cpu_callback,
.priority = 0, .priority = 0,
......
...@@ -574,7 +574,7 @@ static const struct file_operations salinfo_data_fops = { ...@@ -574,7 +574,7 @@ static const struct file_operations salinfo_data_fops = {
.write = salinfo_log_write, .write = salinfo_log_write,
}; };
static int __devinit static int __cpuinit
salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu) salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
{ {
unsigned int i, cpu = (unsigned long)hcpu; unsigned int i, cpu = (unsigned long)hcpu;
...@@ -615,7 +615,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu ...@@ -615,7 +615,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
return NOTIFY_OK; return NOTIFY_OK;
} }
static struct notifier_block salinfo_cpu_notifier = static struct notifier_block salinfo_cpu_notifier __cpuinitdata =
{ {
.notifier_call = salinfo_cpu_callback, .notifier_call = salinfo_cpu_callback,
.priority = 0, .priority = 0,
......
...@@ -118,11 +118,11 @@ struct cpu_cache_info { ...@@ -118,11 +118,11 @@ struct cpu_cache_info {
struct kobject kobj; struct kobject kobj;
}; };
static struct cpu_cache_info all_cpu_cache_info[NR_CPUS]; static struct cpu_cache_info all_cpu_cache_info[NR_CPUS] __cpuinitdata;
#define LEAF_KOBJECT_PTR(x,y) (&all_cpu_cache_info[x].cache_leaves[y]) #define LEAF_KOBJECT_PTR(x,y) (&all_cpu_cache_info[x].cache_leaves[y])
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void cache_shared_cpu_map_setup( unsigned int cpu, static void __cpuinit cache_shared_cpu_map_setup( unsigned int cpu,
struct cache_info * this_leaf) struct cache_info * this_leaf)
{ {
pal_cache_shared_info_t csi; pal_cache_shared_info_t csi;
...@@ -157,7 +157,7 @@ static void cache_shared_cpu_map_setup( unsigned int cpu, ...@@ -157,7 +157,7 @@ static void cache_shared_cpu_map_setup( unsigned int cpu,
&csi) == PAL_STATUS_SUCCESS); &csi) == PAL_STATUS_SUCCESS);
} }
#else #else
static void cache_shared_cpu_map_setup(unsigned int cpu, static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu,
struct cache_info * this_leaf) struct cache_info * this_leaf)
{ {
cpu_set(cpu, this_leaf->shared_cpu_map); cpu_set(cpu, this_leaf->shared_cpu_map);
...@@ -428,13 +428,13 @@ static struct notifier_block __cpuinitdata cache_cpu_notifier = ...@@ -428,13 +428,13 @@ static struct notifier_block __cpuinitdata cache_cpu_notifier =
.notifier_call = cache_cpu_callback .notifier_call = cache_cpu_callback
}; };
static int __cpuinit cache_sysfs_init(void) static int __init cache_sysfs_init(void)
{ {
int i; int i;
for_each_online_cpu(i) { for_each_online_cpu(i) {
cache_cpu_callback(&cache_cpu_notifier, CPU_ONLINE, struct sys_device *sys_dev = get_cpu_sysdev((unsigned int)i);
(void *)(long)i); cache_add_dev(sys_dev);
} }
register_hotcpu_notifier(&cache_cpu_notifier); register_hotcpu_notifier(&cache_cpu_notifier);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment