diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 10:16:43 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 10:16:43 -0400 |
| commit | fcefdb4780afeb1388f47e3e7cb05a52b57bdc11 (patch) | |
| tree | 414bb2ee6fc95e4b37172300657bb0ff8db925b3 | |
| parent | 9e0eef2bfef39fd05a4b9d81b8c0df746daa740d (diff) | |
| download | longterm-queue-4.12-fcefdb4780afeb1388f47e3e7cb05a52b57bdc11.tar.gz | |
tools: drop objtool patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/tools-headers-Sync-objtool-UAPI-header.patch | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/queue/series b/queue/series index 07a3c5c..806c556 100644 --- a/queue/series +++ b/queue/series @@ -50,7 +50,6 @@ bpf-s390x-do-not-reload-skb-pointers-in-non-skb-cont.patch bpf-ppc64-do-not-reload-skb-pointers-in-non-skb-cont.patch bpf-sparc-fix-usage-of-wrong-reg-for-load_skb_regs-a.patch bpf-fix-incorrect-sign-extension-in-check_alu_op.patch -tools-headers-Sync-objtool-UAPI-header.patch x86-insn-eval-Add-utility-functions-to-get-segment-s.patch ACPI-APEI-ERST-Fix-missing-error-handling-in-erst_re.patch acpi-nfit-fix-health-event-notification.patch diff --git a/queue/tools-headers-Sync-objtool-UAPI-header.patch b/queue/tools-headers-Sync-objtool-UAPI-header.patch deleted file mode 100644 index 6d21bef..0000000 --- a/queue/tools-headers-Sync-objtool-UAPI-header.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a356d2ae50790f49858ebed35da9e206336fafee Mon Sep 17 00:00:00 2001 -From: Ingo Molnar <mingo@kernel.org> -Date: Tue, 14 Nov 2017 07:24:22 +0100 -Subject: [PATCH] tools/headers: Sync objtool UAPI header - -commit a356d2ae50790f49858ebed35da9e206336fafee upstream. - -objtool grew this new warning: - - Warning: synced file at 'tools/objtool/arch/x86/include/asm/inat.h' differs from latest kernel version at 'arch/x86/include/asm/inat.h' - -which upstream header grew new INAT_SEG_* definitions. - -Sync up the tooling version of the header. - -Reported-by: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Josh Poimboeuf <jpoimboe@redhat.com> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Ingo Molnar <mingo@kernel.org> - -diff --git a/tools/objtool/arch/x86/include/asm/inat.h b/tools/objtool/arch/x86/include/asm/inat.h -index 02aff0867211..1c78580e58be 100644 ---- a/tools/objtool/arch/x86/include/asm/inat.h -+++ b/tools/objtool/arch/x86/include/asm/inat.h -@@ -97,6 +97,16 @@ - #define INAT_MAKE_GROUP(grp) ((grp << INAT_GRP_OFFS) | INAT_MODRM) - #define INAT_MAKE_IMM(imm) (imm << INAT_IMM_OFFS) - -+/* Identifiers for segment registers */ -+#define INAT_SEG_REG_IGNORE 0 -+#define INAT_SEG_REG_DEFAULT 1 -+#define INAT_SEG_REG_CS 2 -+#define INAT_SEG_REG_SS 3 -+#define INAT_SEG_REG_DS 4 -+#define INAT_SEG_REG_ES 5 -+#define INAT_SEG_REG_FS 6 -+#define INAT_SEG_REG_GS 7 -+ - /* Attribute search APIs */ - extern insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode); - extern int inat_get_last_prefix_id(insn_byte_t last_pfx); --- -2.15.0 - |