diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 05:38:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 05:38:42 -0400 |
| commit | 0cbf3415087c9ec997300b8ba15c12d26ac28e0a (patch) | |
| tree | 356c6d92e78cdf5ebe2ed6033966554ad8490c3b /tools | |
| parent | 374d801522fb4a809395c188b1a867c5ebcda752 (diff) | |
| parent | 92b0a1416be587b87c8ff489b6a74fd929048ca7 (diff) | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/objtool/builtin-check.c | 3 |
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, | |||
| 192 | "complete_and_exit", | 192 | "complete_and_exit", |
| 193 | "kvm_spurious_fault", | 193 | "kvm_spurious_fault", |
| 194 | "__reiserfs_panic", | 194 | "__reiserfs_panic", |
| 195 | "lbug_with_loc" | 195 | "lbug_with_loc", |
| 196 | "fortify_panic", | ||
| 196 | }; | 197 | }; |
| 197 | 198 | ||
| 198 | if (func->bind == STB_WEAK) | 199 | if (func->bind == STB_WEAK) |