Commit 0cbf3415 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 374d8015 92b0a141
...@@ -192,7 +192,8 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func, ...@@ -192,7 +192,8 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,
"complete_and_exit", "complete_and_exit",
"kvm_spurious_fault", "kvm_spurious_fault",
"__reiserfs_panic", "__reiserfs_panic",
"lbug_with_loc" "lbug_with_loc",
"fortify_panic",
}; };
if (func->bind == STB_WEAK) if (func->bind == STB_WEAK)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment