1 files changed, 13 insertions, 21 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index bbdeb48bbf8e..5629e2099130 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -11,6 +11,7 @@ config SUPERH
         select HAVE_DMA_ATTRS
         select HAVE_IRQ_WORK
         select HAVE_PERF_EVENTS
+        select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
         select PERF_USE_VMALLOC
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_BZIP2
@@ -100,10 +101,6 @@ config GENERIC_LOCKBREAK
         def_bool y
         depends on SMP && PREEMPT
 
-config SYS_SUPPORTS_PM
-        bool
-        depends on !SMP
-
 config ARCH_SUSPEND_POSSIBLE
         def_bool n
 
@@ -648,7 +645,7 @@ config CRASH_DUMP
           a specially reserved region and then later executed after
           a crash by kdump/kexec. The crash dump kernel must be compiled
           to a memory address not used by the main kernel using
-          MEMORY_START.
+          PHYSICAL_START.
 
           For more details see Documentation/kdump/kdump.txt
 
@@ -659,6 +656,17 @@ config KEXEC_JUMP
           Jump between original kernel and kexeced kernel and invoke
           code via KEXEC
 
+config PHYSICAL_START
+        hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
+        default MEMORY_START
+        ---help---
+          This gives the physical address where the kernel is loaded
+          and is ordinarily the same as MEMORY_START.
+
+          Different values are primarily used in the case of kexec on panic
+          where the fail safe kernel needs to run at a different address
+          than the panic-ed kernel.
+
 config SECCOMP
         bool "Enable seccomp to safely compute untrusted bytecode"
         depends on PROC_FS
@@ -897,20 +905,4 @@ source "security/Kconfig"
 
 source "crypto/Kconfig"
 
-menuconfig VIRTUALIZATION
-        bool "Virtualization"
-        default n
-        ---help---
-          Say Y here to get to see options for using your Linux host to run other
-          operating systems inside virtual machines (guests).
-          This option alone does not add any kernel code.
-
-          If you say N, all options in this submenu will be skipped and disabled.
-
-if VIRTUALIZATION
-
-source drivers/virtio/Kconfig
-
-endif # VIRTUALIZATION
-
 source "lib/Kconfig"