Merge branches 'sh/ftrace' and 'sh/cachetlb'

diff --combined arch/sh/Kconfig
index 29e41ec,0fb99b0..46d1a5e
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -10,6 -10,7 +10,7 @@@ config SUPER
        select EMBEDDED
        select HAVE_CLK
        select HAVE_IDE
+       select HAVE_LMB
        select HAVE_OPROFILE
        select HAVE_GENERIC_DMA_COHERENT
        select HAVE_IOREMAP_PROT if MMU
@@@ -31,8 -32,6 +32,8 @@@ config SUPERH3
        select HAVE_FUNCTION_TRACER
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
 +      select HAVE_FUNCTION_TRACE_MCOUNT_TEST
 +      select HAVE_FTRACE_SYSCALLS
        select HAVE_ARCH_KGDB
        select ARCH_HIBERNATION_POSSIBLE if MMU