]> git.proxmox.com Git - mirror_ubuntu-kernels.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:02 +0000 (20:16 +0200)
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>
arch/x86/kernel/cpuid.c

index f4548c93ccf5d0cf9fcd6e557e2457cd92ee75bd..dffb102fb8c76a0a980903c2ca14435fa100456c 100644 (file)
@@ -150,7 +150,7 @@ static const struct file_operations cpuid_fops = {
        .open = cpuid_open,
 };
 
-static int cpuid_device_create(int i)
+static int __cpuinit cpuid_device_create(int i)
 {
        int err = 0;
        struct device *dev;
@@ -161,7 +161,9 @@ static int cpuid_device_create(int i)
        return err;
 }
 
-static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
+                                             unsigned long action,
+                                             void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;