summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-07-05 11:06:59 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2017-07-05 11:06:59 +0100
commit98becb781e3e27d74efe5f3653b948d39f694cfb (patch)
tree63d7bcd1ab22c73fb2ecd1670e6bc5c67f6ab560 /arch/arm/Kconfig
parent9e25ebfe56ece7541cd10a20d715cbdd148a2e06 (diff)
parentcd83935be8f5c28ea099ad1efa6321c737e2e12a (diff)
downloadlinux-98becb781e3e27d74efe5f3653b948d39f694cfb.tar.gz
linux-98becb781e3e27d74efe5f3653b948d39f694cfb.tar.bz2
linux-98becb781e3e27d74efe5f3653b948d39f694cfb.zip
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c0fcab6a5504..6900aab4f757 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -56,6 +56,7 @@ config ARM
select HAVE_DMA_API_DEBUG
select HAVE_DMA_CONTIGUOUS if MMU
select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU
+ select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU
select HAVE_EXIT_THREAD
select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)