From patchwork Fri Jan 7 03:56:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 77844 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id F105FB79B7 for ; Fri, 7 Jan 2011 14:56:17 +1100 (EST) Received: by ozlabs.org (Postfix) id 0309EB714A; Fri, 7 Jan 2011 14:56:12 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from kryten (ppp121-44-56-164.lns20.syd6.internode.on.net [121.44.56.164]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id C068CB7149; Fri, 7 Jan 2011 14:56:11 +1100 (EST) Date: Fri, 7 Jan 2011 14:56:09 +1100 From: Anton Blanchard To: benh@kernel.crashing.org Subject: [PATCH 4/8] powerpc/kdump: Remove ppc_md.machine_crash_shutdown Message-ID: <20110107145609.13756a9a@kryten> In-Reply-To: <20110107145255.72cf30ba@kryten> References: <20110107145255.72cf30ba@kryten> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; i486-pc-linux-gnu) Mime-Version: 1.0 Cc: linuxppc-dev@ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org No one uses ppc_md.machine_crash_shutdown, so remove it. Signed-off-by: Anton Blanchard Index: powerpc.git/arch/powerpc/include/asm/machdep.h =================================================================== --- powerpc.git.orig/arch/powerpc/include/asm/machdep.h 2011-01-07 12:51:54.082394288 +1100 +++ powerpc.git/arch/powerpc/include/asm/machdep.h 2011-01-07 12:51:56.222461754 +1100 @@ -236,12 +236,6 @@ struct machdep_calls { #ifdef CONFIG_KEXEC void (*kexec_cpu_down)(int crash_shutdown, int secondary); - /* Called to do the minimal shutdown needed to run a kexec'd kernel - * to run successfully. - * XXX Should we move this one out of kexec scope? - */ - void (*machine_crash_shutdown)(struct pt_regs *regs); - /* Called to do what every setup is needed on image and the * reboot code buffer. Returns 0 on success. * Provide your own (maybe dummy) implementation if your platform Index: powerpc.git/arch/powerpc/kernel/machine_kexec.c =================================================================== --- powerpc.git.orig/arch/powerpc/kernel/machine_kexec.c 2011-01-07 12:51:54.082394288 +1100 +++ powerpc.git/arch/powerpc/kernel/machine_kexec.c 2011-01-07 12:51:56.222461754 +1100 @@ -44,10 +44,7 @@ void machine_kexec_mask_interrupts(void) void machine_crash_shutdown(struct pt_regs *regs) { - if (ppc_md.machine_crash_shutdown) - ppc_md.machine_crash_shutdown(regs); - else - default_machine_crash_shutdown(regs); + default_machine_crash_shutdown(regs); } /* Index: powerpc.git/arch/powerpc/platforms/cell/qpace_setup.c =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/cell/qpace_setup.c 2010-12-13 22:52:03.765247709 +1100 +++ powerpc.git/arch/powerpc/platforms/cell/qpace_setup.c 2011-01-07 12:51:56.222461754 +1100 @@ -148,6 +148,5 @@ define_machine(qpace) { #ifdef CONFIG_KEXEC .machine_kexec = default_machine_kexec, .machine_kexec_prepare = default_machine_kexec_prepare, - .machine_crash_shutdown = default_machine_crash_shutdown, #endif }; Index: powerpc.git/arch/powerpc/platforms/pseries/kexec.c =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/pseries/kexec.c 2010-12-13 22:52:03.745247341 +1100 +++ powerpc.git/arch/powerpc/platforms/pseries/kexec.c 2011-01-07 12:51:56.222461754 +1100 @@ -66,7 +66,6 @@ static int __init pseries_kexec_setup(vo { ppc_md.machine_kexec = default_machine_kexec; ppc_md.machine_kexec_prepare = default_machine_kexec_prepare; - ppc_md.machine_crash_shutdown = default_machine_crash_shutdown; return 0; }