diff options
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/crash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c index 5cdd2f5fa064..7d1bbb4403ba 100644 --- a/arch/ia64/kernel/crash.c +++ b/arch/ia64/kernel/crash.c | |||
@@ -21,9 +21,9 @@ | |||
21 | #include <asm/mca.h> | 21 | #include <asm/mca.h> |
22 | 22 | ||
23 | int kdump_status[NR_CPUS]; | 23 | int kdump_status[NR_CPUS]; |
24 | atomic_t kdump_cpu_freezed; | 24 | static atomic_t kdump_cpu_frozen; |
25 | atomic_t kdump_in_progress; | 25 | atomic_t kdump_in_progress; |
26 | int kdump_on_init = 1; | 26 | static int kdump_on_init = 1; |
27 | 27 | ||
28 | static inline Elf64_Word | 28 | static inline Elf64_Word |
29 | *append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data, | 29 | *append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data, |
@@ -86,7 +86,7 @@ kdump_wait_cpu_freeze(void) | |||
86 | int cpu_num = num_online_cpus() - 1; | 86 | int cpu_num = num_online_cpus() - 1; |
87 | int timeout = 1000; | 87 | int timeout = 1000; |
88 | while(timeout-- > 0) { | 88 | while(timeout-- > 0) { |
89 | if (atomic_read(&kdump_cpu_freezed) == cpu_num) | 89 | if (atomic_read(&kdump_cpu_frozen) == cpu_num) |
90 | return 0; | 90 | return 0; |
91 | udelay(1000); | 91 | udelay(1000); |
92 | } | 92 | } |
@@ -108,8 +108,8 @@ machine_crash_shutdown(struct pt_regs *pt) | |||
108 | kexec_disable_iosapic(); | 108 | kexec_disable_iosapic(); |
109 | #ifdef CONFIG_SMP | 109 | #ifdef CONFIG_SMP |
110 | kdump_smp_send_stop(); | 110 | kdump_smp_send_stop(); |
111 | /* not all cpu response to IPI, send INIT to freeze them */ | ||
111 | if (kdump_wait_cpu_freeze() && kdump_on_init) { | 112 | if (kdump_wait_cpu_freeze() && kdump_on_init) { |
112 | //not all cpu response to IPI, send INIT to freeze them | ||
113 | kdump_smp_send_init(); | 113 | kdump_smp_send_init(); |
114 | } | 114 | } |
115 | #endif | 115 | #endif |
@@ -136,7 +136,7 @@ kdump_cpu_freeze(struct unw_frame_info *info, void *arg) | |||
136 | cpuid = smp_processor_id(); | 136 | cpuid = smp_processor_id(); |
137 | crash_save_this_cpu(); | 137 | crash_save_this_cpu(); |
138 | current->thread.ksp = (__u64)info->sw - 16; | 138 | current->thread.ksp = (__u64)info->sw - 16; |
139 | atomic_inc(&kdump_cpu_freezed); | 139 | atomic_inc(&kdump_cpu_frozen); |
140 | kdump_status[cpuid] = 1; | 140 | kdump_status[cpuid] = 1; |
141 | mb(); | 141 | mb(); |
142 | #ifdef CONFIG_HOTPLUG_CPU | 142 | #ifdef CONFIG_HOTPLUG_CPU |