Messages in this thread Patch in this message | | | Date | Sun, 24 Jun 2018 13:46:06 +0200 (CEST) | From | Thomas Gleixner <> | Subject | [GIT pull] core updates for 4.18 |
| |
Linus,
please pull the latest core-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus
Two tiny fixes:
- Add the missing machine_real_restart() to objtools noreturn list so it stops complaining
- Fix a trivial comment typo
Thanks,
tglx
------------------> Josh Poimboeuf (1): objtool: Add machine_real_restart() to the noreturn list
Wei Wang (1): kernel.h: Fix a typo in comment
include/linux/kernel.h | 2 +- tools/objtool/check.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index d23123238534..941dc0a5a877 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -666,7 +666,7 @@ do { \ * your code. (Extra memory is used for special buffers that are * allocated when trace_printk() is used.) * - * A little optization trick is done here. If there's only one + * A little optimization trick is done here. If there's only one * argument, there's no need to scan the string for printf formats. * The trace_puts() will suffice. But how can we take advantage of * using trace_puts() when trace_printk() has only one argument? diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 38047c6aa575..f4a25bd1871f 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -164,6 +164,7 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func, "lbug_with_loc", "fortify_panic", "usercopy_abort", + "machine_real_restart", }; if (func->bind == STB_WEAK)
| |