diff options
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e084b7e981e8..abba5b8c9d74 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1971,7 +1971,7 @@ endchoice | |||
| 1971 | 1971 | ||
| 1972 | config XIP_KERNEL | 1972 | config XIP_KERNEL |
| 1973 | bool "Kernel Execute-In-Place from ROM" | 1973 | bool "Kernel Execute-In-Place from ROM" |
| 1974 | depends on !ZBOOT_ROM | 1974 | depends on !ZBOOT_ROM && !ARM_LPAE |
| 1975 | help | 1975 | help |
| 1976 | Execute-In-Place allows the kernel to run from non-volatile storage | 1976 | Execute-In-Place allows the kernel to run from non-volatile storage |
| 1977 | directly addressable by the CPU, such as NOR flash. This saves RAM | 1977 | directly addressable by the CPU, such as NOR flash. This saves RAM |
| @@ -2001,7 +2001,7 @@ config XIP_PHYS_ADDR | |||
| 2001 | 2001 | ||
| 2002 | config KEXEC | 2002 | config KEXEC |
| 2003 | bool "Kexec system call (EXPERIMENTAL)" | 2003 | bool "Kexec system call (EXPERIMENTAL)" |
| 2004 | depends on EXPERIMENTAL | 2004 | depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU) |
| 2005 | help | 2005 | help |
| 2006 | kexec is a system call that implements the ability to shutdown your | 2006 | kexec is a system call that implements the ability to shutdown your |
| 2007 | current kernel, and to start another kernel. It is like a reboot | 2007 | current kernel, and to start another kernel. It is like a reboot |