From patchwork Mon Nov 14 22:30:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 125620 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 9B44CB74FB for ; Tue, 15 Nov 2011 09:31:05 +1100 (EST) Received: from smtp-out1.tiscali.nl (smtp-out1.tiscali.nl [195.241.79.176]) by ozlabs.org (Postfix) with ESMTP id 9866DB71FE for ; Tue, 15 Nov 2011 09:30:53 +1100 (EST) Received: from [212.123.169.34] (helo=[192.168.1.100]) by smtp-out1.tiscali.nl with esmtp (Exim) (envelope-from ) id 1RQ53B-0003k1-8D; Mon, 14 Nov 2011 23:30:49 +0100 Subject: [PATCH] powerpc/44x: Fix typos '47x' and 'CONFIG_47x' From: Paul Bolle To: Benjamin Herrenschmidt , Paul Mackerras Date: Mon, 14 Nov 2011 23:30:27 +0100 Message-ID: <1321309827.20271.146.camel@x61.thuisdomein> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 (2.32.3-1.fc14) Cc: linuxppc-dev@lists.ozlabs.org, Suzuki Poulose , linux-kernel@vger.kernel.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: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Commit 674bfa4855 ("powerpc/44x: Kexec support for PPC440X chipsets") used the Kconfig symbol '47x', and the macro 'CONFIG_47x'. Neither exist. These should have been 'PPC_47x' and 'CONFIG_PPC_47x'. Fix these typos. Also fix a related preprocessor check at the top of kexec.h. Signed-off-by: Paul Bolle --- The commit explanation sounds very confident, but this is all just educated guesswork. Entirely untested too (I haven't got the hardware nor the toolchain). So this needs careful review. arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/kexec.h | 3 ++- arch/powerpc/kernel/misc_32.S | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b177caa..951e18f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -345,7 +345,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE config KEXEC bool "kexec system call (EXPERIMENTAL)" - depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !47x)) && EXPERIMENTAL + depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !PPC_47x)) && 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/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index f921eb1..fadf513 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -2,7 +2,8 @@ #define _ASM_POWERPC_KEXEC_H #ifdef __KERNEL__ -#if defined(CONFIG_FSL_BOOKE) || defined(CONFIG_44x) +#if defined(CONFIG_FSL_BOOKE) || \ + (defined(CONFIG_44x) && !defined(CONFIG_PPC_47x)) /* * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index f7d760a..7cd07b4 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -738,7 +738,7 @@ relocate_new_kernel: mr r5, r31 li r0, 0 -#elif defined(CONFIG_44x) && !defined(CONFIG_47x) +#elif defined(CONFIG_44x) && !defined(CONFIG_PPC_47x) /* * Code for setting up 1:1 mapping for PPC440x for KEXEC