aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-02 08:59:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-02 08:59:17 -0700
commit035f1456f9ed256cd1a92ae1b81cc24413359e61 (patch)
tree8cadc5b6dae613b4947b70a231a600707e3be709
parentMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentlivepatch: Make livepatch dependent on !TRIM_UNUSED_KSYMS (diff)
downloadlinux-dev-035f1456f9ed256cd1a92ae1b81cc24413359e61.tar.xz
linux-dev-035f1456f9ed256cd1a92ae1b81cc24413359e61.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fix from Jiri Kosina: "Kconfig dependency fix for livepatching infrastructure from Miroslav Benes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: livepatch: Make livepatch dependent on !TRIM_UNUSED_KSYMS
-rw-r--r--kernel/livepatch/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/livepatch/Kconfig b/kernel/livepatch/Kconfig
index 045022557936..ec4565122e65 100644
--- a/kernel/livepatch/Kconfig
+++ b/kernel/livepatch/Kconfig
@@ -10,6 +10,7 @@ config LIVEPATCH
depends on SYSFS
depends on KALLSYMS_ALL
depends on HAVE_LIVEPATCH
+ depends on !TRIM_UNUSED_KSYMS
help
Say Y here if you want to support kernel live patching.
This option has no runtime impact until a kernel "patch"