]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
i386: Misc cpuinit annotations
authorSatyam Sharma <satyam@infradead.org>
Wed, 17 Oct 2007 16:04:36 +0000 (18:04 +0200)
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:16:00 +0000 (20:16 +0200)
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>
arch/x86/kernel/msr.c

index c044de310b691901c05453c046fe48796d0d5182..df85c9c13601e4205fae3192538757babbe223ae 100644 (file)
@@ -133,7 +133,7 @@ static const struct file_operations msr_fops = {
        .open = msr_open,
 };
 
-static int msr_device_create(int i)
+static int __cpuinit msr_device_create(int i)
 {
        int err = 0;
        struct device *dev;
@@ -144,7 +144,7 @@ static int msr_device_create(int i)
        return err;
 }
 
-static int msr_class_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
                                unsigned long action, void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;