From patchwork Fri Jan 7 03:57:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 77846 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 C8085B7ADB for ; Fri, 7 Jan 2011 14:57:11 +1100 (EST) Received: by ozlabs.org (Postfix) id AD87AB715F; Fri, 7 Jan 2011 14:57:05 +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 812F2B715B; Fri, 7 Jan 2011 14:57:05 +1100 (EST) Date: Fri, 7 Jan 2011 14:57:03 +1100 From: Anton Blanchard To: benh@kernel.crashing.org Subject: [PATCH 5/8] powerpc/kexec: Don't initialise kexec hooks to default handlers Message-ID: <20110107145703.466def36@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 There's no need to initialise ppc_md.machine_kexec and ppc_md.machine_kexec_prepare to the default handlers. Signed-off-by: Anton Blanchard Index: powerpc.git/arch/powerpc/platforms/cell/qpace_setup.c =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/cell/qpace_setup.c 2011-01-07 12:51:56.222461754 +1100 +++ powerpc.git/arch/powerpc/platforms/cell/qpace_setup.c 2011-01-07 12:51:58.112521318 +1100 @@ -145,8 +145,4 @@ define_machine(qpace) { .calibrate_decr = generic_calibrate_decr, .progress = qpace_progress, .init_IRQ = iic_init_IRQ, -#ifdef CONFIG_KEXEC - .machine_kexec = default_machine_kexec, - .machine_kexec_prepare = default_machine_kexec_prepare, -#endif }; Index: powerpc.git/arch/powerpc/platforms/pseries/kexec.c =================================================================== --- powerpc.git.orig/arch/powerpc/platforms/pseries/kexec.c 2011-01-07 12:51:56.222461754 +1100 +++ powerpc.git/arch/powerpc/platforms/pseries/kexec.c 2011-01-07 12:51:58.112521318 +1100 @@ -61,12 +61,3 @@ void __init setup_kexec_cpu_down_xics(vo { ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics; } - -static int __init pseries_kexec_setup(void) -{ - ppc_md.machine_kexec = default_machine_kexec; - ppc_md.machine_kexec_prepare = default_machine_kexec_prepare; - - return 0; -} -machine_device_initcall(pseries, pseries_kexec_setup);