diff options
author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2009-11-26 03:29:02 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:29:41 -0500 |
commit | 767df1bdd8cbff2c8c40c9ac8295bbdaa5fb24c4 (patch) | |
tree | 9bf8f14c69240f535c8fc0578e61785db58d36c2 | |
parent | 0444c9bd0cf4e0eb946a7fcaf34765accfa9404a (diff) |
x86, mce: Add __cpuinit to hotplug callback functions
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>
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 5f277cad2ed7..0bcaa3875863 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -1953,13 +1953,14 @@ static __cpuinit void mce_remove_device(unsigned int cpu) | |||
1953 | } | 1953 | } |
1954 | 1954 | ||
1955 | /* Make sure there are no machine checks on offlined CPUs. */ | 1955 | /* Make sure there are no machine checks on offlined CPUs. */ |
1956 | static void mce_disable_cpu(void *h) | 1956 | static void __cpuinit mce_disable_cpu(void *h) |
1957 | { | 1957 | { |
1958 | unsigned long action = *(unsigned long *)h; | 1958 | unsigned long action = *(unsigned long *)h; |
1959 | int i; | 1959 | int i; |
1960 | 1960 | ||
1961 | if (!mce_available(¤t_cpu_data)) | 1961 | if (!mce_available(¤t_cpu_data)) |
1962 | return; | 1962 | return; |
1963 | |||
1963 | if (!(action & CPU_TASKS_FROZEN)) | 1964 | if (!(action & CPU_TASKS_FROZEN)) |
1964 | cmci_clear(); | 1965 | cmci_clear(); |
1965 | for (i = 0; i < banks; i++) { | 1966 | for (i = 0; i < banks; i++) { |
@@ -1970,7 +1971,7 @@ static void mce_disable_cpu(void *h) | |||
1970 | } | 1971 | } |
1971 | } | 1972 | } |
1972 | 1973 | ||
1973 | static void mce_reenable_cpu(void *h) | 1974 | static void __cpuinit mce_reenable_cpu(void *h) |
1974 | { | 1975 | { |
1975 | unsigned long action = *(unsigned long *)h; | 1976 | unsigned long action = *(unsigned long *)h; |
1976 | int i; | 1977 | int i; |