objtool-4.9: add some proper patch comments and rename patches

diff --git a/objtool-4.9/objtool_headers_sync.patch b/objtool-4.9/objtool-header-file-sync-up.patch
similarity index 93%
rename from objtool-4.9/objtool_headers_sync.patch
rename to objtool-4.9/objtool-header-file-sync-up.patch
index a661ecc513a76cb42c75e07ebc57219e5e659b4a..c0ea40eef4e56cfcbea53a4c330eede4f60ec159 100644 (file)
--- a/objtool-4.9/objtool_headers_sync.patch
+++ b/objtool-4.9/objtool-header-file-sync-up.patch
@@ -4,6 +4,11 @@ To: Greg KH <gregkh@linuxfoundation.org>
 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Subject: objtool: header file sync-up
 
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+When building tools/objtool/ it rightly complains about a number of
+files being out of sync.  Fix this up by syncing them properly with the
+relevant in-kernel versions.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 

diff --git a/objtool-4.9/objtool-move-checking-code-to-check.c.patch b/objtool-4.9/objtool-move-checking-code-to-check.c.patch
index 3210da9b574785e4256fe46c2f6e8375ed53a5be..b65e46601932a923142e171f0363f22fe6e083b4 100644 (file)
--- a/objtool-4.9/objtool-move-checking-code-to-check.c.patch
+++ b/objtool-4.9/objtool-move-checking-code-to-check.c.patch
@@ -20,6 +20,7 @@ Cc: Thomas Gleixner <tglx@linutronix.de>
 Cc: live-patching@vger.kernel.org
 Link: http://lkml.kernel.org/r/294c5c695fd73c1a5000bbe5960a7c9bec4ee6b4.1498659915.git.jpoimboe@redhat.com
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
+[backported by hand to 4.9, this was a pain... - gregkh]
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---

diff --git a/objtool-4.9/objdiff.patch b/objtool-4.9/objtool-sync-up-with-the-4.14.47-version-of-objtool.patch
similarity index 99%
rename from objtool-4.9/objdiff.patch
rename to objtool-4.9/objtool-sync-up-with-the-4.14.47-version-of-objtool.patch
index b070fdbc1350d9895f60d2b4c7576199be885b69..4c41fe3d8a82a42ed066283be37c5bae701749cc 100644 (file)
--- a/objtool-4.9/objdiff.patch
+++ b/objtool-4.9/objtool-sync-up-with-the-4.14.47-version-of-objtool.patch
@@ -4,7 +4,27 @@ To: Greg KH <gregkh@linuxfoundation.org>
 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Subject: objtool: sync up with the 4.14.47 version of objtool
 
+There are pros and cons of dealing with tools in the kernel directory.
+The pros are the fact that development happens fast, and new features
+can be added to the kernel and the tools at the same times.  The cons
+are when dealing with backported kernel patches, it can be necessary to
+backport parts of the tool changes as well.
 
+For 4.9.y so far, we have backported individual patches.  That quickly
+breaks down when there are minor differences between how backports were
+handled, so grabbing 40+ patch long series can be difficult, not
+impossible, but really frustrating to attempt.
+
+To help mitigate this mess, here's a single big patch to sync up the
+objtool logic to the 4.14.47 version of the tool.  From this point
+forward (after some other minor header file patches are applied), the
+tool should be in sync and much easier to maintain over time.
+
+This has survivied my limited testing, and as the codebase is identical
+to 4.14.47, I'm pretty comfortable dropping this big change in here in
+4.9.y.  Hopefully all goes well...
+
+Cc: Josh Poimboeuf <jpoimboe@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---

diff --git a/objtool-4.9/perf_headers_sync.patch b/objtool-4.9/perf-tools-header-file-sync-up.patch
similarity index 98%
rename from objtool-4.9/perf_headers_sync.patch
rename to objtool-4.9/perf-tools-header-file-sync-up.patch
index 3311a5fbac85e9b99f93cc698e7feb4fb774914e..d78f62152e6c48d401c65bbda9558b112b969384 100644 (file)
--- a/objtool-4.9/perf_headers_sync.patch
+++ b/objtool-4.9/perf-tools-header-file-sync-up.patch
@@ -4,6 +4,11 @@ To: Greg KH <gregkh@linuxfoundation.org>
 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Subject: perf/tools: header file sync up
 
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+When building tools/perf/ it rightly complains about a number of .h
+files being out of sync.  Fix this up by syncing them properly with the
+relevant in-kernel versions.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 

diff --git a/objtool-4.9/series b/objtool-4.9/series
index 082f84a366c7b1edd4360fd372f464846e1c9fb9..862af42d2e73deb8aad3aa208dcadb17b0219839 100644 (file)
--- a/objtool-4.9/series
+++ b/objtool-4.9/series
@@ -17,13 +17,13 @@ tools-include-adopt-__same_type-and-__must_be_array-from-the-kernel.patch
 tools-include-move-array_size-to-linux-kernel.h.patch
 tools-include-drop-array_size-definition-from-linux-hashtable.h.patch
 tools-include-include-missing-headers-for-fls-and-types-in-linux-log2.h.patch
-objdiff.patch
+objtool-sync-up-with-the-4.14.47-version-of-objtool.patch
 objtool-support-gcc-8-s-cold-subfunctions.patch
 objtool-support-gcc-8-switch-tables.patch
 objtool-detect-rip-relative-switch-table-references.patch
 objtool-detect-rip-relative-switch-table-references-part-2.patch
 objtool-fix-noreturn-detection-for-recursive-sibling-calls.patch
 objtool-x86-add-several-functions-and-files-to-the-objtool-whitelist.patch
-perf_headers_sync.patch
-objtool_headers_sync.patch
-xen-fixup.patch
+perf-tools-header-file-sync-up.patch
+objtool-header-file-sync-up.patch
+x86-xen-add-unwind-hint-annotations-to-xen_setup_gdt.patch

diff --git a/objtool-4.9/xen-fixup.patch b/objtool-4.9/x86-xen-add-unwind-hint-annotations-to-xen_setup_gdt.patch
similarity index 100%
rename from objtool-4.9/xen-fixup.patch
rename to objtool-4.9/x86-xen-add-unwind-hint-annotations-to-xen_setup_gdt.patch