4.9-stable patches

added patches:
	sync-objtool-s-copy-of-x86-opcode-map.txt.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index ce1a07c5b461d95f15cc5da96a9f05cf457f1a1f..d164c9a557dbabf8177bb51443720c533bc845fe 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,3 +1,4 @@
+sync-objtool-s-copy-of-x86-opcode-map.txt.patch
 tracing-remove-extra-zeroing-out-of-the-ring-buffer-page.patch
 tracing-fix-possible-double-free-on-failure-of-allocating-trace-buffer.patch
 tracing-fix-crash-when-it-fails-to-alloc-ring-buffer.patch

diff --git a/queue-4.9/sync-objtool-s-copy-of-x86-opcode-map.txt.patch b/queue-4.9/sync-objtool-s-copy-of-x86-opcode-map.txt.patch
new file mode 100644 (file)
index 0000000..dc7a6a1
--- /dev/null
+++ b/queue-4.9/sync-objtool-s-copy-of-x86-opcode-map.txt.patch
@@ -0,0 +1,45 @@
+From foo@baz Sun Dec 31 14:13:42 CET 2017
+Date: Sun, 31 Dec 2017 14:13:42 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: sync objtool's copy of x86-opcode-map.txt
+
+When building objtool, we get the warning:
+       warning: objtool: x86 instruction decoder differs from kernel
+
+That's due to commit 2816c0455cea088f07a210f8a00701a82a78aa9c which was
+commit 12a78d43de767eaf8fb272facb7a7b6f2dc6a9df upstream that modified
+arch/x86/lib/x86-opcode-map.txt without also updating the objtool copy.
+The objtool copy was updated in a much larger patch upstream, but we
+don't need all of that here, so just update the single file.
+
+If this gets too annoying, I'll just end up doing what we did for 4.14
+and backport the whole series to keep this from happening again, but as
+this seems to be rare in the 4.9-stable series, this single patch should
+be fine.
+
+Cc: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: H. Peter Anvin <hpa@zytor.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+
+---
+ tools/objtool/arch/x86/insn/x86-opcode-map.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/objtool/arch/x86/insn/x86-opcode-map.txt
++++ b/tools/objtool/arch/x86/insn/x86-opcode-map.txt
+@@ -896,7 +896,7 @@ EndTable
+ 
+ GrpTable: Grp3_1
+ 0: TEST Eb,Ib
+-1:
++1: TEST Eb,Ib
+ 2: NOT Eb
+ 3: NEG Eb
+ 4: MUL AL,Eb