diff options
| author | Benjamin Herrenschmidt | 2010-05-31 02:01:50 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2010-05-31 02:01:50 +0200 |
| commit | ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2 (patch) | |
| tree | 6539480b50258f30af799a6ab38529d7b2d7e538 /arch/powerpc/Kconfig | |
| parent | Merge commit 'jwb/next' into next (diff) | |
| parent | powerpc/85xx: Add P1021MDS board support (diff) | |
| download | kernel-qcow2-linux-ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2.tar.gz kernel-qcow2-linux-ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2.tar.xz kernel-qcow2-linux-ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2.zip | |
Merge commit 'kumar/next' into next
Conflicts:
arch/powerpc/sysdev/fsl_msi.c
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 66a315e06dce..328774bd41ee 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -351,7 +351,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE config KEXEC bool "kexec system call (EXPERIMENTAL)" - depends on PPC_BOOK3S && EXPERIMENTAL + depends on (PPC_BOOK3S || (FSL_BOOKE && !SMP)) && 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 |