Update "Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for ..."
Part of the section we move was moved upstream in 4.19.15 by commit ae206a1a5e3a "kbuild: fix false positive warning/error about missing libelf". Don't duplicate that section.
This commit is contained in:
parent
bf22005770
commit
e898a5d96a
|
@ -381,6 +381,8 @@ linux (4.19.20-1) UNRELEASED; urgency=medium
|
|||
* percpu: convert spin_lock_irq to spin_lock_irqsave (fixes boot failure with
|
||||
alpha-generic flavour)
|
||||
* debian/tests/python: Fix spurious failure due to misuse of stderr
|
||||
* Update "Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for ..."
|
||||
to not duplicate the conditional warning/error
|
||||
|
||||
[ Marcin Juszkiewicz ]
|
||||
* [arm64] enable ARM_CCI_PMU so ARM_CCI400_PMU and ARM_CCI5xx_PMU options
|
||||
|
|
|
@ -7,8 +7,8 @@ This reverts commit 9f0c18aec620bc9d82268b3cb937568dd07b43ff. This
|
|||
check doesn't make sense for OOT modules as they should always use
|
||||
a pre-built objtool.
|
||||
---
|
||||
Makefile | 33 ++++++++++++++++-----------------
|
||||
1 file changed, 16 insertions(+), 17 deletions(-)
|
||||
Makefile | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
|
@ -30,7 +30,7 @@ a pre-built objtool.
|
|||
|
||||
ifeq ($(KBUILD_EXTMOD),)
|
||||
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
|
||||
@@ -1110,6 +1099,22 @@ uapi-asm-generic:
|
||||
@@ -1110,6 +1099,17 @@ uapi-asm-generic:
|
||||
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
|
||||
src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
|
||||
|
||||
|
@ -40,11 +40,6 @@ a pre-built objtool.
|
|||
+ ifeq ($(has_libelf),1)
|
||||
+ objtool_target := tools/objtool FORCE
|
||||
+ else
|
||||
+ ifdef CONFIG_UNWINDER_ORC
|
||||
+ $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
|
||||
+ else
|
||||
+ $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
|
||||
+ endif
|
||||
+ SKIP_STACK_VALIDATION := 1
|
||||
+ export SKIP_STACK_VALIDATION
|
||||
+ endif
|
||||
|
|
Loading…
Reference in New Issue