Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-block.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 8d90564c2bcfe7dee87dbb5e814e4ed6db054504..0e318c905eea984d57824526f50be505be82ddbd 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -44,6 +44,7 @@ config SUPERH32
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_ARCH_KGDB
        select HAVE_HW_BREAKPOINT
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_ARCH_KGDB
        select HAVE_HW_BREAKPOINT

+       select HAVE_MIXED_BREAKPOINTS_REGS

        select PERF_EVENTS if HAVE_HW_BREAKPOINT
        select ARCH_HIBERNATION_POSSIBLE if MMU
 
        select PERF_EVENTS if HAVE_HW_BREAKPOINT
        select ARCH_HIBERNATION_POSSIBLE if MMU
 


@@ -157,7 +158,6 @@ config LOCKDEP_SUPPORT
 
 config HAVE_LATENCYTOP_SUPPORT
        def_bool y
 
 config HAVE_LATENCYTOP_SUPPORT
        def_bool y

-       depends on !SMP

 
 config ARCH_HAS_ILOG2_U32
        def_bool n
 
 config ARCH_HAS_ILOG2_U32
        def_bool n


@@ -237,6 +237,8 @@ config CPU_SHX2
 config CPU_SHX3
        bool
        select DMA_COHERENT
 config CPU_SHX3
        bool
        select DMA_COHERENT

+       select SYS_SUPPORTS_SMP
+       select SYS_SUPPORTS_NUMA

 
 config ARCH_SHMOBILE
        bool
 
 config ARCH_SHMOBILE
        bool


@@ -453,18 +455,12 @@ config CPU_SUBTYPE_SH7786
        select CPU_SH4A
        select CPU_SHX3
        select CPU_HAS_PTEAEX
        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 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
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
 
 # SH4AL-DSP Processor Support


@@ -634,7 +630,7 @@ config KEXEC
 
 config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
 
 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
        help
          Generate crash dump after being started by kexec.
          This should be normally only set in special crash dump kernels


@@ -706,6 +702,13 @@ config NR_CPUS
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
 
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
 

+config HOTPLUG_CPU
+       bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+       depends on SMP && HOTPLUG && EXPERIMENTAL
+       help
+         Say Y here to experiment with turning CPUs off and on.  CPUs
+         can be controlled through /sys/devices/system/cpu.
+

 source "kernel/Kconfig.preempt"
 
 config GUSA
 source "kernel/Kconfig.preempt"
 
 config GUSA


@@ -732,6 +735,8 @@ config GUSA_RB
          LLSC, this should be more efficient than the other alternative of
          disabling interrupts around the atomic sequence.
 
          LLSC, this should be more efficient than the other alternative of
          disabling interrupts around the atomic sequence.
 

+source "drivers/sh/Kconfig"
+

 endmenu
 
 menu "Boot options"
 endmenu
 
 menu "Boot options"


@@ -863,4 +868,20 @@ source "security/Kconfig"
 
 source "crypto/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"
 source "lib/Kconfig"