openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2018-06-24 20:06:42 +08:00
parent d4e860eaf0 8730662d7b
commit d3a6749c33
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/kernel.h
View File

@ -666,7 +666,7 @@ do { \
* your code. (Extra memory is used for special buffers that are * your code. (Extra memory is used for special buffers that are
* allocated when trace_printk() is used.) * 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. * argument, there's no need to scan the string for printf formats.
* The trace_puts() will suffice. But how can we take advantage of * The trace_puts() will suffice. But how can we take advantage of
* using trace_puts() when trace_printk() has only one argument? * using trace_puts() when trace_printk() has only one argument?

1
tools/objtool/check.c
View File

@ -164,6 +164,7 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,
"lbug_with_loc", "lbug_with_loc",
"fortify_panic", "fortify_panic",
"usercopy_abort", "usercopy_abort",
"machine_real_restart",
}; };
if (func->bind == STB_WEAK) if (func->bind == STB_WEAK)