Commit:     25d1b5167780c7f245d9655d302f6a3d8bf61d19
Parent:     58d5fa7a6a6fc4754d295d0999b284edd67c8620
Author:     Satyam Sharma <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 18:04:33 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 20:15:25 2007 +0200

    i386: Fix section mismatch
    Fix bugzilla #8679
    WARNING: arch/i386/kernel/built-in.o(.data+0x2148): Section mismatch: 
    to .init.text: (between 'thermal_throttle_cpu_notifier' and 'mtrr_mutex')
    comes because struct notifier_block thermal_throttle_cpu_notifier in
    arch/i386/kernel/cpu/mcheck/therm_throt.c goes in .data section but the
    notifier callback function itself has been marked __cpuinit which becomes
    __init == .init.text when HOTPLUG_CPU=n.  The warning is bogus because the
    callback will never be called out if HOTPLUG_CPU=n in the first place (as
    one can see from kernel/cpu.c, the cpu_chain itself is __cpuinitdata :-)
    So, let's mark thermal_throttle_cpu_notifier as __cpuinitdata to fix
    the section mismatch warning.
    [ tglx: arch/x86 adaptation ]
    Signed-off-by: Satyam Sharma <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[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/cpu/mcheck/therm_throt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c 
index 1203dc5..494d320 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -152,7 +152,7 @@ static __cpuinit int thermal_throttle_cpu_callback(struct 
notifier_block *nfb,
        return NOTIFY_OK;
-static struct notifier_block thermal_throttle_cpu_notifier =
+static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata =
        .notifier_call = thermal_throttle_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