Merge branch 'master' into sh/hw-breakpoints

Conflict between FPU thread flag migration and debug
thread flag addition.

Conflicts:
	arch/sh/include/asm/thread_info.h
	arch/sh/include/asm/ubc.h
	arch/sh/kernel/process_32.c

1 files changed, 17 insertions, 12 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index d563884833e9..185e9af251cf 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -16,7 +16,9 @@ config SUPERH
         select HAVE_IOREMAP_PROT if MMU
         select HAVE_ARCH_TRACEHOOK
         select HAVE_DMA_API_DEBUG
+        select HAVE_DMA_ATTRS
         select HAVE_PERF_EVENTS
+        select PERF_USE_VMALLOC
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_BZIP2
         select HAVE_KERNEL_LZMA
@@ -37,6 +39,7 @@ config SUPERH32
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+        select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_ARCH_KGDB
         select HAVE_HW_BREAKPOINT if CPU_SH4A
@@ -171,6 +174,12 @@ config ARCH_HAS_CPU_IDLE_WAIT
 config IO_TRAPPED
         bool
 
+config DMA_COHERENT
+        bool
+
+config DMA_NONCOHERENT
+        def_bool !DMA_COHERENT
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
@@ -221,6 +230,7 @@ config CPU_SHX2
 
 config CPU_SHX3
         bool
+        select DMA_COHERENT
 
 config ARCH_SHMOBILE
         bool
@@ -762,17 +772,6 @@ config ENTRY_OFFSET
         default "0x00010000" if PAGE_SIZE_64KB
         default "0x00000000"
 
-config UBC_WAKEUP
-        bool "Wakeup UBC on startup"
-        depends on CPU_SH4 && !CPU_SH4A
-        help
-          Selecting this option will wakeup the User Break Controller (UBC) on
-          startup. Although the UBC is left in an awake state when the processor
-          comes up, some boot loaders misbehave by putting the UBC to sleep in a
-          power saving state, which causes issues with things like ptrace().
-
-          If unsure, say N.
-
 choice
         prompt "Kernel command line"
         optional
@@ -819,7 +818,13 @@ config MAPLE
          Dreamcast with a serial line terminal or a remote network
          connection.
 
-source "arch/sh/drivers/pci/Kconfig"
+config PCI
+        bool "PCI support"
+        depends on SYS_SUPPORTS_PCI
+        help
+          Find out whether you have a PCI motherboard. PCI is the name of a
+          bus system, i.e. the way the CPU talks to the other stuff inside
+          your box. If you have PCI, say Y, otherwise N.
 
 source "drivers/pci/pcie/Kconfig"