Commit:     761c4bf821b67334e2391ef968396069b91801b7
Parent:     75e3808b67f88cdd8c531dda3e00deb3623a3dac
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:00 2007 +0200

    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 <[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/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 c044de3..df85c9c 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -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;
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