From 9457854d31aba583376d2ce67ef6f875fbe4313e Mon Sep 17 00:00:00 2001 From: Suzuki Poulose Date: Mon, 14 Nov 2011 16:43:50 +0000 Subject: [PATCH] --- yaml --- r: 275541 b: refs/heads/master c: bbc24a25e29136a56cf5015ef23eb2c2e8828023 h: refs/heads/master i: 275539: 570f9afe571cbe19d594a4f996afc34aaacae2f8 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 2 +- trunk/arch/powerpc/kernel/misc_32.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a862eb7f5aef..6bab88a050e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82640a6b9166c993104e255b414298cbec6ecd45 +refs/heads/master: bbc24a25e29136a56cf5015ef23eb2c2e8828023 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index b177caa56d95..951e18f5335b 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/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/trunk/arch/powerpc/kernel/misc_32.S b/trunk/arch/powerpc/kernel/misc_32.S index f7d760ab5ca1..7cd07b42ca1a 100644 --- a/trunk/arch/powerpc/kernel/misc_32.S +++ b/trunk/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