diff options
author | Anton Blanchard <anton@samba.org> | 2011-11-29 19:23:10 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-07 22:02:22 -0500 |
commit | 9b00ac06978c54788f13eefd34a07b77db48d567 (patch) | |
tree | 4727d71f5d4071b5595d4268c0fe05c8bf2ae02a /arch/powerpc/include | |
parent | 58154c8ce71a7854d969d73468fd00e5eeeab708 (diff) |
powerpc: Remove broken and complicated kdump system reset code
We have a lot of complicated logic that handles possible recursion between
kdump and a system reset exception. We can solve this in a much simpler
way using the same setjmp/longjmp tricks xmon does.
As a first step, this patch removes the old system reset code.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/kexec.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index f921eb121d39..209ed8ba1637 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h | |||
@@ -73,11 +73,6 @@ extern void kexec_smp_wait(void); /* get and clear naca physid, wait for | |||
73 | master to copy new code to 0 */ | 73 | master to copy new code to 0 */ |
74 | extern int crashing_cpu; | 74 | extern int crashing_cpu; |
75 | extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *)); | 75 | extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *)); |
76 | extern cpumask_t cpus_in_sr; | ||
77 | static inline int kexec_sr_activated(int cpu) | ||
78 | { | ||
79 | return cpumask_test_cpu(cpu, &cpus_in_sr); | ||
80 | } | ||
81 | 76 | ||
82 | struct kimage; | 77 | struct kimage; |
83 | struct pt_regs; | 78 | struct pt_regs; |
@@ -94,7 +89,6 @@ extern void reserve_crashkernel(void); | |||
94 | extern void machine_kexec_mask_interrupts(void); | 89 | extern void machine_kexec_mask_interrupts(void); |
95 | 90 | ||
96 | #else /* !CONFIG_KEXEC */ | 91 | #else /* !CONFIG_KEXEC */ |
97 | static inline int kexec_sr_activated(int cpu) { return 0; } | ||
98 | static inline void crash_kexec_secondary(struct pt_regs *regs) { } | 92 | static inline void crash_kexec_secondary(struct pt_regs *regs) { } |
99 | 93 | ||
100 | static inline int overlaps_crashkernel(unsigned long start, unsigned long size) | 94 | static inline int overlaps_crashkernel(unsigned long start, unsigned long size) |