summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-18 12:38:42 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-18 12:38:42 +0300
commit0cbf3415087c9ec997300b8ba15c12d26ac28e0a (patch)
tree356c6d92e78cdf5ebe2ed6033966554ad8490c3b
parent374d801522fb4a809395c188b1a867c5ebcda752 (diff)
parent92b0a1416be587b87c8ff489b6a74fd929048ca7 (diff)
downloadlinux-0cbf3415087c9ec997300b8ba15c12d26ac28e0a.tar.xz
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fix from Thomas Gleixner: "A single fix which adds fortify_panic to the list of no return functions" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Add fortify_panic as __noreturn function
-rw-r--r--tools/objtool/builtin-check.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index 282a60368b14..5f66697fe1e0 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -192,7 +192,8 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,
"complete_and_exit",
"kvm_spurious_fault",
"__reiserfs_panic",
- "lbug_with_loc"
+ "lbug_with_loc",
+ "fortify_panic",
};
if (func->bind == STB_WEAK)