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:00 -0400 |
commit | 761c4bf821b67334e2391ef968396069b91801b7 (patch) | |
tree | 03728cbb6032fd2047b7ffe2834115154e2e1ef8 /arch | |
parent | 75e3808b67f88cdd8c531dda3e00deb3623a3dac (diff) |
i386: Misc cpuinit annotations
msr_class_cpu_callback() can be marked __cpuinit, being the notifier
callback for a __cpuinitdata notifier_block. So can be marked
msr_device_create() too, called only from the newly-__cpuinit
msr_class_cpu_callback() or from __init-marked msr_init().
[ 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')
-rw-r--r-- | arch/x86/kernel/msr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index c044de310b69..df85c9c13601 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c | |||
@@ -133,7 +133,7 @@ static const struct file_operations msr_fops = { | |||
133 | .open = msr_open, | 133 | .open = msr_open, |
134 | }; | 134 | }; |
135 | 135 | ||
136 | static int msr_device_create(int i) | 136 | static int __cpuinit msr_device_create(int i) |
137 | { | 137 | { |
138 | int err = 0; | 138 | int err = 0; |
139 | struct device *dev; | 139 | struct device *dev; |
@@ -144,7 +144,7 @@ static int msr_device_create(int i) | |||
144 | return err; | 144 | return err; |
145 | } | 145 | } |
146 | 146 | ||
147 | static int msr_class_cpu_callback(struct notifier_block *nfb, | 147 | static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb, |
148 | unsigned long action, void *hcpu) | 148 | unsigned long action, void *hcpu) |
149 | { | 149 | { |
150 | unsigned int cpu = (unsigned long)hcpu; | 150 | unsigned int cpu = (unsigned long)hcpu; |