diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2016-04-18 20:45:32 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-04-18 20:45:32 +1000 |
| commit | 8404410b296095c78ed63f163ac5d417ff0647dd (patch) | |
| tree | 542fcea7d106a8fd608c47da1a8c88255f3e2c5f /arch/powerpc/Kconfig | |
| parent | cxl: Delete an unnecessary check before the function call "kfree" (diff) | |
| parent | powerpc/livepatch: Add live patching support on ppc64le (diff) | |
| download | linux-dev-8404410b296095c78ed63f163ac5d417ff0647dd.tar.xz linux-dev-8404410b296095c78ed63f163ac5d417ff0647dd.zip | |
Merge branch 'topic/livepatch' into next
Merge the support for live patching on ppc64le using mprofile-kernel.
This branch has also been merged into the livepatching tree for v4.7.
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index fbebde0771c8..9b5c7bcc06c4 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -160,6 +160,7 @@ config PPC select HAVE_ARCH_SECCOMP_FILTER select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT + select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS config GENERIC_CSUM def_bool CPU_LITTLE_ENDIAN @@ -1107,3 +1108,5 @@ config PPC_LIB_RHEAP bool source "arch/powerpc/kvm/Kconfig" + +source "kernel/livepatch/Kconfig" |