Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Cleanup crash/kexec code

Remove some unnecessary defines and fix some spelling mistakes.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Anton Blanchard and committed by
Benjamin Herrenschmidt
8c27474a 07fe0c61

+3 -19
-1
arch/powerpc/include/asm/kexec.h
··· 49 49 #define KEXEC_STATE_REAL_MODE 2 50 50 51 51 #ifndef __ASSEMBLY__ 52 - #include <linux/cpumask.h> 53 52 #include <asm/reg.h> 54 53 55 54 typedef void (*crash_shutdown_t)(void);
+3 -18
arch/powerpc/kernel/crash.c
··· 10 10 * 11 11 */ 12 12 13 - #undef DEBUG 14 - 15 13 #include <linux/kernel.h> 16 14 #include <linux/smp.h> 17 15 #include <linux/reboot.h> 18 16 #include <linux/kexec.h> 19 - #include <linux/bootmem.h> 20 17 #include <linux/export.h> 21 18 #include <linux/crash_dump.h> 22 19 #include <linux/delay.h> 23 - #include <linux/elf.h> 24 - #include <linux/elfcore.h> 25 20 #include <linux/init.h> 26 21 #include <linux/irq.h> 27 22 #include <linux/types.h> 28 - #include <linux/memblock.h> 29 23 30 24 #include <asm/processor.h> 31 25 #include <asm/machdep.h> 32 26 #include <asm/kexec.h> 33 27 #include <asm/kdump.h> 34 28 #include <asm/prom.h> 35 - #include <asm/firmware.h> 36 29 #include <asm/smp.h> 37 30 #include <asm/system.h> 38 31 #include <asm/setjmp.h> 39 32 40 - #ifdef DEBUG 41 - #include <asm/udbg.h> 42 - #define DBG(fmt...) udbg_printf(fmt) 43 - #else 44 - #define DBG(fmt...) 45 - #endif 46 - 47 - /* This keeps a track of which one is crashing cpu. */ 33 + /* This keeps a track of which one is the crashing cpu. */ 48 34 int crashing_cpu = -1; 49 35 static cpumask_t cpus_in_crash = CPU_MASK_NONE; 50 36 ··· 187 201 static void crash_kexec_prepare_cpus(int cpu) 188 202 { 189 203 /* 190 - * move the secondarys to us so that we can copy 204 + * move the secondaries to us so that we can copy 191 205 * the new kernel 0-0x100 safely 192 206 * 193 207 * do this if kexec in setup.c ? ··· 288 302 unsigned int i; 289 303 int (*old_handler)(struct pt_regs *regs); 290 304 291 - 292 305 /* 293 306 * This function is only called after the system 294 307 * has panicked or is otherwise in a critical state. ··· 313 328 machine_kexec_mask_interrupts(); 314 329 315 330 /* 316 - * Call registered shutdown routines savely. Swap out 331 + * Call registered shutdown routines safely. Swap out 317 332 * __debugger_fault_handler, and replace on exit. 318 333 */ 319 334 old_handler = __debugger_fault_handler;