[linux] 02/02: Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules"
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Jan 14 20:06:36 UTC 2018
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux.
commit d9fe539b06480c03b0523eb8d6d8bcb5e17e695c
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Jan 14 19:44:14 2018 +0000
Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules"
This removes the bogus check for libelf-dev.
---
debian/changelog | 2 +
...ool-fix-config_stack_validation-y-warning.patch | 60 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 63 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 4b56a68..947b0cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,8 @@ linux (4.14.13-1) UNRELEASED; urgency=medium
* abiupdate.py: Add support for security mirrors
* Fix dependencies related to objtool (Closes: #886474):
- linux-headers: Add versioned dependency on linux-kbuild
+ - Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree
+ modules"
-- Salvatore Bonaccorso <carnil at debian.org> Wed, 10 Jan 2018 09:58:46 +0100
diff --git a/debian/patches/debian/revert-objtool-fix-config_stack_validation-y-warning.patch b/debian/patches/debian/revert-objtool-fix-config_stack_validation-y-warning.patch
new file mode 100644
index 0000000..adbaadb
--- /dev/null
+++ b/debian/patches/debian/revert-objtool-fix-config_stack_validation-y-warning.patch
@@ -0,0 +1,60 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 14 Jan 2018 19:27:18 +0000
+Subject: Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for
+ out-of-tree modules"
+
+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(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -937,22 +937,6 @@ mod_sign_cmd = true
+ endif
+ export mod_sign_cmd
+
+-ifdef CONFIG_STACK_VALIDATION
+- has_libelf := $(call try-run,\
+- echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)
+- 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
+-endif
+-
+
+ ifeq ($(KBUILD_EXTMOD),)
+ core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
+@@ -1080,6 +1064,22 @@ prepare0: archprepare gcc-plugins
+ # All the preparing..
+ prepare: prepare0 prepare-objtool
+
++ifdef CONFIG_STACK_VALIDATION
++ has_libelf := $(call try-run,\
++ echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)
++ 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
++endif
++
+ PHONY += prepare-objtool
+ prepare-objtool: $(objtool_target)
+
diff --git a/debian/patches/series b/debian/patches/series
index 37ca682..60bf5e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -84,6 +84,7 @@ bugfix/all/xen-time-do-not-decrease-steal-time-after-live-migra.patch
bugfix/all/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch
bugfix/all/libsas-Disable-asynchronous-aborts-for-SATA-devices.patch
bugfix/all/drm-nouveau-disp-gf119-add-missing-drive-vfunc-ptr.patch
+debian/revert-objtool-fix-config_stack_validation-y-warning.patch
# Miscellaneous features
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list