diff options
| author | Linus Torvalds | 2018-06-24 20:06:42 +0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-06-24 20:06:42 +0800 |
| commit | d3a6749c3364d576e9b8515ccfb14ce57cf3b9b2 (patch) | |
| tree | 2424d46c5152cea8c472974cf0ef719363a80700 | |
| parent | d4e860eaf0584dfcc1375e06eeb34f85f43c8d34 (diff) | |
| parent | 8730662d7b2582f65dd6c59ab1e0b7fa461c79b0 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
"Two tiny fixes:
- Add the missing machine_real_restart() to objtools noreturn list so
it stops complaining
- Fix a trivial comment typo"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kernel.h: Fix a typo in comment
objtool: Add machine_real_restart() to the noreturn list
| -rw-r--r-- | include/linux/kernel.h | 2 | ||||
| -rw-r--r-- | tools/objtool/check.c | 1 |
2 files changed, 2 insertions, 1 deletions
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) |