Commit:     1e32b073f372f0fe903c4474fbd47c2ac61428c8
Parent:     761c4bf821b67334e2391ef968396069b91801b7
Author:     Satyam Sharma <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 18:04:36 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 20:16:02 2007 +0200

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 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 f4548c9..dffb102 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to