| Message ID | 1321309827.20271.146.camel@x61.thuisdomein (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 11/15/11 04:00, Paul Bolle wrote: > 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. Thanks for catching this. I have already sent a series which fixes the same. (Sub: Kdump support for PPC440x ). But I think I missed one hunk in the misc_32.S. > > Also fix a related preprocessor check at the top of kexec.h. > Thanks Suzuki
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
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 <pebolle@tiscali.nl> --- 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(-)