diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-25 00:24:04 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-25 00:24:04 +1000 |
| commit | 9fc849144c80091252551a4897782ed5321d654a (patch) | |
| tree | 0af5b9f46ee5a79a6abe64ee63eea12f2a99fdbb /arch/powerpc/Kconfig | |
| parent | 9a914aa6824ac5d5fd3195ed422f31540a0ab767 (diff) | |
| parent | 24bd909e94776ecce95291bff910f14c78ac4a43 (diff) | |
Merge branch 'topic/kprobes' into next
Although most of these kprobes patches are powerpc specific, there's a couple
that touch generic code (with Acks). At the moment there's one conflict with
acme's tree, but it's not too bad. Still just in case some other conflicts show
up, we've put these in a topic branch so another tree could merge some or all of
it if necessary.
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 276a624ec355..7401e921aad0 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -186,6 +186,7 @@ config PPC select HAVE_IRQ_EXIT_ON_IRQ_STACK select HAVE_KERNEL_GZIP select HAVE_KPROBES + select HAVE_KPROBES_ON_FTRACE select HAVE_KRETPROBES select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS select HAVE_MEMBLOCK |