diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 69aad7e96a53..20c7e7c669d2 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -643,7 +643,7 @@ static int mce_cap_init(void) | |||
643 | return 0; | 643 | return 0; |
644 | } | 644 | } |
645 | 645 | ||
646 | static void mce_init(void *dummy) | 646 | static void mce_init(void) |
647 | { | 647 | { |
648 | mce_banks_t all_banks; | 648 | mce_banks_t all_banks; |
649 | u64 cap; | 649 | u64 cap; |
@@ -776,7 +776,7 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c) | |||
776 | 776 | ||
777 | machine_check_vector = do_machine_check; | 777 | machine_check_vector = do_machine_check; |
778 | 778 | ||
779 | mce_init(NULL); | 779 | mce_init(); |
780 | mce_cpu_features(c); | 780 | mce_cpu_features(c); |
781 | mce_init_timer(); | 781 | mce_init_timer(); |
782 | } | 782 | } |
@@ -1020,7 +1020,7 @@ static int mce_shutdown(struct sys_device *dev) | |||
1020 | */ | 1020 | */ |
1021 | static int mce_resume(struct sys_device *dev) | 1021 | static int mce_resume(struct sys_device *dev) |
1022 | { | 1022 | { |
1023 | mce_init(NULL); | 1023 | mce_init(); |
1024 | mce_cpu_features(¤t_cpu_data); | 1024 | mce_cpu_features(¤t_cpu_data); |
1025 | 1025 | ||
1026 | return 0; | 1026 | return 0; |
@@ -1030,7 +1030,7 @@ static void mce_cpu_restart(void *data) | |||
1030 | { | 1030 | { |
1031 | del_timer_sync(&__get_cpu_var(mce_timer)); | 1031 | del_timer_sync(&__get_cpu_var(mce_timer)); |
1032 | if (mce_available(¤t_cpu_data)) | 1032 | if (mce_available(¤t_cpu_data)) |
1033 | mce_init(NULL); | 1033 | mce_init(); |
1034 | mce_init_timer(); | 1034 | mce_init_timer(); |
1035 | } | 1035 | } |
1036 | 1036 | ||