diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-02 18:59:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-02 18:59:17 +0300 |
| commit | 035f1456f9ed256cd1a92ae1b81cc24413359e61 (patch) | |
| tree | 8cadc5b6dae613b4947b70a231a600707e3be709 /kernel | |
| parent | f2a025defd804be938f8acffe62e4801a3ed1601 (diff) | |
| parent | 5720acf4bfc142ba568d5b6782fceaf62ed15e0b (diff) | |
| download | linux-035f1456f9ed256cd1a92ae1b81cc24413359e61.tar.xz | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/livepatch/Kconfig | 1 |
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" |