4.14-stable patches

added patches:
	objtool-add-machine_real_restart-to-the-noreturn-list.patch
	objtool-add-rewind_stack_do_exit-to-the-noreturn-list.patch

diff --git a/queue-4.14/objtool-add-machine_real_restart-to-the-noreturn-list.patch b/queue-4.14/objtool-add-machine_real_restart-to-the-noreturn-list.patch
new file mode 100644 (file)
index 0000000..310835c
--- /dev/null
+++ b/queue-4.14/objtool-add-machine_real_restart-to-the-noreturn-list.patch
@@ -0,0 +1,37 @@
+From 684fb246578b9e81fc7b4ca5c71eae22edb650b2 Mon Sep 17 00:00:00 2001
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Tue, 19 Jun 2018 10:47:50 -0500
+Subject: objtool: Add machine_real_restart() to the noreturn list
+
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+
+commit 684fb246578b9e81fc7b4ca5c71eae22edb650b2 upstream.
+
+machine_real_restart() is annotated as '__noreturn", so add it to the
+objtool noreturn list.  This fixes the following warning with clang and
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y:
+
+  arch/x86/kernel/reboot.o: warning: objtool: native_machine_emergency_restart() falls through to next function machine_power_off()
+
+Reported-by: Matthias Kaehlcke <mka@chromium.org>
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Matthias Kaehlcke <mka@chromium.org>
+Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
+Link: https://lkml.kernel.org/r/791712792aa4431bdd55bf1beb33a169ddf3b4a2.1529423255.git.jpoimboe@redhat.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/objtool/check.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tools/objtool/check.c
++++ b/tools/objtool/check.c
+@@ -165,6 +165,7 @@ static int __dead_end_function(struct ob
+               "__reiserfs_panic",
+               "lbug_with_loc",
+               "fortify_panic",
++              "machine_real_restart",
+       };
+ 
+       if (func->bind == STB_WEAK)

diff --git a/queue-4.14/objtool-add-rewind_stack_do_exit-to-the-noreturn-list.patch b/queue-4.14/objtool-add-rewind_stack_do_exit-to-the-noreturn-list.patch
new file mode 100644 (file)
index 0000000..78aa5a5
--- /dev/null
+++ b/queue-4.14/objtool-add-rewind_stack_do_exit-to-the-noreturn-list.patch
@@ -0,0 +1,34 @@
+From 4fa5ecda2bf96be7464eb406df8aba9d89260227 Mon Sep 17 00:00:00 2001
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Thu, 4 Apr 2019 12:17:35 -0500
+Subject: objtool: Add rewind_stack_do_exit() to the noreturn list
+
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+
+commit 4fa5ecda2bf96be7464eb406df8aba9d89260227 upstream.
+
+This fixes the following warning seen on GCC 7.3:
+
+  arch/x86/kernel/dumpstack.o: warning: objtool: oops_end() falls through to next function show_regs()
+
+Reported-by: kbuild test robot <lkp@intel.com>
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: https://lkml.kernel.org/r/3418ebf5a5a9f6ed7e80954c741c0b904b67b5dc.1554398240.git.jpoimboe@redhat.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/objtool/check.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tools/objtool/check.c
++++ b/tools/objtool/check.c
+@@ -166,6 +166,7 @@ static int __dead_end_function(struct ob
+               "lbug_with_loc",
+               "fortify_panic",
+               "machine_real_restart",
++              "rewind_stack_do_exit",
+       };
+ 
+       if (func->bind == STB_WEAK)

diff --git a/queue-4.14/series b/queue-4.14/series
index ea0452aaae745213ef6aa61ba0cec50ba31a9ebb..a33a24331d8d32269f7bf70a945135813f47877a 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -7,3 +7,5 @@ hid-wacom-fix-bit-shift-for-cintiq-companion-2.patch
 hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch
 rdma-directly-cast-the-sockaddr-union-to-sockaddr.patch
 ib-directly-cast-the-sockaddr-union-to-aockaddr.patch
+objtool-add-machine_real_restart-to-the-noreturn-list.patch
+objtool-add-rewind_stack_do_exit-to-the-noreturn-list.patch