summaryrefslogtreecommitdiffstats
path: root/arch/parisc/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-15 14:51:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-15 14:51:45 -0700
commit60ea7bb0077b38f80a3a27b9e32ad45879944a57 (patch)
treec983c6b14f8b9ba513d9ff7f9f596cd6c8c4671a /arch/parisc/Kconfig
parent806fdcce017dc98c4dbf8ed001750a0d7d2bb0af (diff)
parent366dd4ea9d5f0eb78fdf4982d76506f99480ec0a (diff)
downloadop-kernel-dev-60ea7bb0077b38f80a3a27b9e32ad45879944a57.zip
op-kernel-dev-60ea7bb0077b38f80a3a27b9e32ad45879944a57.tar.gz
Merge branch 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc ftrace fixes from Helge Deller: "This is (most likely) the last pull request for v4.6 for the parisc architecture. It fixes the FTRACE feature for parisc, which is horribly broken since quite some time and doesn't even compile. This patch just fixes the bare minimum (it actually removes more lines than it adds), so that the function tracer works again on 32- and 64bit kernels. I've queued up additional patches on top of this patch which e.g. add the syscall tracer, but those have to wait for the merge window for v4.7." * 'parisc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Fix ftrace function tracer
Diffstat (limited to 'arch/parisc/Kconfig')
-rw-r--r--arch/parisc/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index bd3c873..88cfaa8 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -4,8 +4,8 @@ config PARISC
select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_IDE
select HAVE_OPROFILE
- select HAVE_FUNCTION_TRACER if 64BIT
- select HAVE_FUNCTION_GRAPH_TRACER if 64BIT
+ select HAVE_FUNCTION_TRACER
+ select HAVE_FUNCTION_GRAPH_TRACER
select ARCH_WANT_FRAME_POINTERS
select RTC_CLASS
select RTC_DRV_GENERIC
OpenPOWER on IntegriCloud