From patchwork Wed Nov 30 10:23:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 128466 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 71EF410165F for ; Wed, 30 Nov 2011 21:29:35 +1100 (EST) Received: from localhost (ppp121-44-25-37.lns20.syd6.internode.on.net [121.44.25.37]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 907C11008B1; Wed, 30 Nov 2011 21:28:51 +1100 (EST) X-Mailbox-Line: From anton@samba.org Wed Nov 30 21:24:15 2011 Message-Id: <20111130102415.043782722@samba.org> User-Agent: quilt/0.48-1 Date: Wed, 30 Nov 2011 21:23:12 +1100 From: Anton Blanchard To: benh@kernel.crashing.org, paulus@samba.org, hbabu@us.ibm.com Subject: [PATCH 4/9] powerpc: Cleanup crash/kexec code References: <20111130102308.348262468@samba.org> Content-Disposition: inline; filename=crash_cleanup Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Remove some unnecessary defines and fix some spelling mistakes. Signed-off-by: Anton Blanchard Index: linux-build/arch/powerpc/kernel/crash.c =================================================================== --- linux-build.orig/arch/powerpc/kernel/crash.c 2011-11-25 16:42:11.554016696 +1100 +++ linux-build/arch/powerpc/kernel/crash.c 2011-11-25 16:42:37.110467611 +1100 @@ -10,41 +10,27 @@ * */ -#undef DEBUG - #include #include #include #include -#include #include #include #include -#include -#include #include #include #include -#include #include #include #include #include #include -#include #include #include #include -#ifdef DEBUG -#include -#define DBG(fmt...) udbg_printf(fmt) -#else -#define DBG(fmt...) -#endif - -/* This keeps a track of which one is crashing cpu. */ +/* This keeps a track of which one is the crashing cpu. */ int crashing_cpu = -1; static cpumask_t cpus_in_crash = CPU_MASK_NONE; @@ -201,7 +187,7 @@ void crash_kexec_secondary(struct pt_reg static void crash_kexec_prepare_cpus(int cpu) { /* - * move the secondarys to us so that we can copy + * move the secondaries to us so that we can copy * the new kernel 0-0x100 safely * * do this if kexec in setup.c ? @@ -302,7 +288,6 @@ void default_machine_crash_shutdown(stru unsigned int i; int (*old_handler)(struct pt_regs *regs); - /* * This function is only called after the system * has panicked or is otherwise in a critical state. @@ -328,7 +313,7 @@ void default_machine_crash_shutdown(stru machine_kexec_mask_interrupts(); /* - * Call registered shutdown routines savely. Swap out + * Call registered shutdown routines safely. Swap out * __debugger_fault_handler, and replace on exit. */ old_handler = __debugger_fault_handler; Index: linux-build/arch/powerpc/include/asm/kexec.h =================================================================== --- linux-build.orig/arch/powerpc/include/asm/kexec.h 2011-11-25 16:41:06.224864016 +1100 +++ linux-build/arch/powerpc/include/asm/kexec.h 2011-11-25 16:42:37.110467611 +1100 @@ -49,7 +49,6 @@ #define KEXEC_STATE_REAL_MODE 2 #ifndef __ASSEMBLY__ -#include #include typedef void (*crash_shutdown_t)(void);