Commit:     1e35669d017eac5bea4739f927b28e64731504e1
Parent:     ff472a114ca11f5354912745fbb94bb66ec10916
Author:     Sam Ravnborg <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:33:36 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:33:36 2008 +0100

    x86: fix section mismatch warning in mcheck/mce_64.c
    Fix following warning:
    WARNING: arch/x86/kernel/cpu/mcheck/built-in.o(.text+0x752): Section 
mismatch: reference to .cpuinit.text:mce_create_device in 'mce_cpu_callback'
    mce_cpu_callback() is only used by mce_cpu_notofier.
    The notifier is only used for hotplugable cpu's as it is
    registered using register_hotcpu_notifier(),
    Annotate them both __cpuinit to fix the warning.
    Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/kernel/cpu/mcheck/mce_64.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c 
index 98b23d5..9a699ed 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -854,8 +854,8 @@ static void mce_remove_device(unsigned int cpu)
 /* Get notified when a cpu comes on/off. Be hotplug friendly. */
-static int
-mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int __cpuinit mce_cpu_callback(struct notifier_block *nfb,
+                                     unsigned long action, void *hcpu)
        unsigned int cpu = (unsigned long)hcpu;
@@ -872,7 +872,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long 
action, void *hcpu)
        return NOTIFY_OK;
-static struct notifier_block mce_cpu_notifier = {
+static struct notifier_block mce_cpu_notifier __cpuinitdata = {
        .notifier_call = mce_cpu_callback,
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