]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
x86, mce: Add __cpuinit to hotplug callback functions
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Thu, 26 Nov 2009 08:29:02 +0000 (17:29 +0900)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Nov 2009 09:29:41 +0000 (10:29 +0100)
The mce_disable_cpu() and mce_reenable_cpu() are called only
from mce_cpu_callback() which is marked as __cpuinit.
So these functions can be __cpuinit too.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <ak@linux.intel.com>
LKML-Reference: <4B0E3C4E.4090809@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/mcheck/mce.c

index 5f277cad2ed76ef027a743a1bba73cb0f62a8d54..0bcaa3875863aaefa98942e00d93ae5be0fecdb6 100644 (file)
@@ -1953,13 +1953,14 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
 }
 
 /* Make sure there are no machine checks on offlined CPUs. */
-static void mce_disable_cpu(void *h)
+static void __cpuinit mce_disable_cpu(void *h)
 {
        unsigned long action = *(unsigned long *)h;
        int i;
 
        if (!mce_available(&current_cpu_data))
                return;
+
        if (!(action & CPU_TASKS_FROZEN))
                cmci_clear();
        for (i = 0; i < banks; i++) {
@@ -1970,7 +1971,7 @@ static void mce_disable_cpu(void *h)
        }
 }
 
-static void mce_reenable_cpu(void *h)
+static void __cpuinit mce_reenable_cpu(void *h)
 {
        unsigned long action = *(unsigned long *)h;
        int i;