diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-08 19:52:59 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-08 19:52:59 +0200 |
commit | 612ab8ad64140f0f291d7baae45982ce7119839a (patch) | |
tree | 8c586e733f64d01becf365cfc753e8ff4f087bd2 /Makefile | |
parent | Linux 5.9-rc4 (diff) | |
parent | Revert "kbuild: use -flive-patching when CONFIG_LIVEPATCH is enabled" (diff) | |
download | linux-612ab8ad64140f0f291d7baae45982ce7119839a.tar.xz linux-612ab8ad64140f0f291d7baae45982ce7119839a.zip |
Merge tag 'livepatching-for-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching fix from Petr Mladek:
"Workaround for 'unreachable instruction' objtool warnings that happen
with some compiler versions"
* tag 'livepatching-for-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
Revert "kbuild: use -flive-patching when CONFIG_LIVEPATCH is enabled"
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -882,10 +882,6 @@ KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections LDFLAGS_vmlinux += --gc-sections endif -ifdef CONFIG_LIVEPATCH -KBUILD_CFLAGS += $(call cc-option, -flive-patching=inline-clone) -endif - ifdef CONFIG_SHADOW_CALL_STACK CC_FLAGS_SCS := -fsanitize=shadow-call-stack KBUILD_CFLAGS += $(CC_FLAGS_SCS) |