From patchwork Mon Nov 3 20:01:36 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 6961 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3D26CDDFB4 for ; Tue, 4 Nov 2008 07:01:58 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [85.10.199.196]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C8C50DDED5 for ; Tue, 4 Nov 2008 07:01:41 +1100 (EST) Received: id: bigeasy by Chamillionaire.breakpoint.cc authenticated by bigeasy with local (easymta 1.00 BETA 1) id 1Kx5cH-0008Ad-2g; Mon, 03 Nov 2008 21:01:37 +0100 From: Sebastian Andrzej Siewior To: linuxppc-dev@ozlabs.org Subject: [PATCH 2/2] powerpc: enable kexec support on mpc8544ds Date: Mon, 3 Nov 2008 21:01:36 +0100 Message-Id: <1225742496-31319-3-git-send-email-sebastian@breakpoint.cc> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1225742496-31319-1-git-send-email-sebastian@breakpoint.cc> References: <1225742496-31319-1-git-send-email-sebastian@breakpoint.cc> Cc: Sebastian Andrzej Siewior X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org From: Sebastian Andrzej Siewior Signed-off-by: Sebastian Andrzej Siewior --- arch/powerpc/Kconfig | 2 +- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 587da5e..c2c6a20 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -304,7 +304,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE config KEXEC bool "kexec system call (EXPERIMENTAL)" - depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM) && EXPERIMENTAL + depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM || MPC85xx_DS) && EXPERIMENTAL help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index 3d5f21b..ae573e8 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -227,6 +228,11 @@ define_machine(mpc8544_ds) { .restart = fsl_rstcr_restart, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, +#ifdef CONFIG_KEXEC + .machine_kexec = default_machine_kexec, + .machine_kexec_prepare = default_machine_kexec_prepare, + .machine_crash_shutdown = default_machine_crash_shutdown, +#endif }; define_machine(mpc8572_ds) {