diff options
author | Satyam Sharma <satyam@infradead.org> | 2007-10-17 12:04:36 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:16:02 -0400 |
commit | 1e32b073f372f0fe903c4474fbd47c2ac61428c8 (patch) | |
tree | fc1fabaad723439e893625190fdd6594173ddd41 /arch/x86/kernel | |
parent | 761c4bf821b67334e2391ef968396069b91801b7 (diff) |
i386: misc cpuinit annotations
cpuid_class_cpu_callback() is callback function of a CPU hotplug
notifier_block (that is already marked as __cpuinitdata). Therefore
it can safely be marked as __cpuinit.
cpuid_device_create() is only referenced from other functions that
are __cpuinit or __init. So it can also be safely marked __cpuinit.
[ tglx: arch/x86 adaptation ]
Signed-off-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpuid.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index f4548c93ccf5..dffb102fb8c7 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c | |||
@@ -150,7 +150,7 @@ static const struct file_operations cpuid_fops = { | |||
150 | .open = cpuid_open, | 150 | .open = cpuid_open, |
151 | }; | 151 | }; |
152 | 152 | ||
153 | static int cpuid_device_create(int i) | 153 | static int __cpuinit cpuid_device_create(int i) |
154 | { | 154 | { |
155 | int err = 0; | 155 | int err = 0; |
156 | struct device *dev; | 156 | struct device *dev; |
@@ -161,7 +161,9 @@ static int cpuid_device_create(int i) | |||
161 | return err; | 161 | return err; |
162 | } | 162 | } |
163 | 163 | ||
164 | static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) | 164 | static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb, |
165 | unsigned long action, | ||
166 | void *hcpu) | ||
165 | { | 167 | { |
166 | unsigned int cpu = (unsigned long)hcpu; | 168 | unsigned int cpu = (unsigned long)hcpu; |
167 | 169 | ||