Merge branch 'sh/smp'

[pandora-kernel.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 05cef50..d73bd4d 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -183,6 +183,9 @@ config DMA_COHERENT
 config DMA_NONCOHERENT
        def_bool !DMA_COHERENT
 
 config DMA_NONCOHERENT
        def_bool !DMA_COHERENT
 

+config NEED_DMA_MAP_STATE
+       def_bool DMA_NONCOHERENT
+

 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"


@@ -703,6 +706,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


@@ -729,6 +739,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"