From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Jun 2018 16:58:14 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.9.106~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b32cbb9265f8c8f729cfbd312e0d72a3a1719313;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	objtool-enclose-contents-of-unreachable-macro-in-a-block.patch
---

diff --git a/queue-4.9/objtool-enclose-contents-of-unreachable-macro-in-a-block.patch b/queue-4.9/objtool-enclose-contents-of-unreachable-macro-in-a-block.patch
new file mode 100644
index 00000000000..9f5330d62ae
--- /dev/null
+++ b/queue-4.9/objtool-enclose-contents-of-unreachable-macro-in-a-block.patch
@@ -0,0 +1,45 @@
+From 4e4636cf981b5b629fbfb78aa9f232e015f7d521 Mon Sep 17 00:00:00 2001
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Mon, 27 Feb 2017 22:21:16 -0600
+Subject: objtool: Enclose contents of unreachable() macro in a block
+
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+
+commit 4e4636cf981b5b629fbfb78aa9f232e015f7d521 upstream.
+
+Guenter Roeck reported a boot failure in mips64.  It was bisected to the
+following commit:
+
+  d1091c7fa3d5 ("objtool: Improve detection of BUG() and other dead ends")
+
+The unreachable() macro was formerly only composed of a single
+statement.  The above commit added a second statement, but neglected to
+enclose the statements in a block.
+
+Suggested-by: Guenter Roeck <linux@roeck-us.net>
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Fixes: d1091c7fa3d5 ("objtool: Improve detection of BUG() and other dead ends")
+Link: http://lkml.kernel.org/r/20170228042116.glmwmwiohcix7o4a@treble
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/compiler-gcc.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -223,7 +223,8 @@
+  * this in the preprocessor, but we can live with this because they're
+  * unreleased.  Really, we need to have autoconf for the kernel.
+  */
+-#define unreachable() annotate_unreachable(); __builtin_unreachable()
++#define unreachable() \
++	do { annotate_unreachable(); __builtin_unreachable(); } while (0)
+ 
+ /* Mark a function definition as prohibited from being cloned. */
+ #define __noclone	__attribute__((__noclone__, __optimize__("no-tracer")))
diff --git a/queue-4.9/series b/queue-4.9/series
index 862af42d2e7..6d86daf52c0 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -27,3 +27,4 @@ objtool-x86-add-several-functions-and-files-to-the-objtool-whitelist.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
+objtool-enclose-contents-of-unreachable-macro-in-a-block.patch