Merge branch 'sh/highmem'

diff --combined arch/sh/Kconfig
index 38611bc,67ca505..e6c4776
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -236,6 -236,8 +236,8 @@@ config CPU_SHX
  config CPU_SHX3
        bool
        select DMA_COHERENT
+       select SYS_SUPPORTS_SMP
+       select SYS_SUPPORTS_NUMA
  
  config ARCH_SHMOBILE
        bool
@@@ -452,18 -454,12 +454,12 @@@ config CPU_SUBTYPE_SH778
        select CPU_SH4A
        select CPU_SHX3
        select CPU_HAS_PTEAEX
-       select ARCH_SPARSEMEM_ENABLE
-       select SYS_SUPPORTS_NUMA
-       select SYS_SUPPORTS_SMP
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
  
  config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"
        select CPU_SH4A
        select CPU_SHX3
-       select ARCH_SPARSEMEM_ENABLE
-       select SYS_SUPPORTS_NUMA
-       select SYS_SUPPORTS_SMP
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
  
  # SH4AL-DSP Processor Support
@@@ -633,7 -629,7 +629,7 @@@ config KEXE
  
  config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
 -      depends on SUPERH32 && EXPERIMENTAL
 +      depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP
        help
          Generate crash dump after being started by kexec.
          This should be normally only set in special crash dump kernels