Skip to content

Commit d3a6749

Browse files
committed
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
2 parents d4e860e + 8730662 commit d3a6749

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

include/linux/kernel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ do { \
666666
* your code. (Extra memory is used for special buffers that are
667667
* allocated when trace_printk() is used.)
668668
*
669-
* A little optization trick is done here. If there's only one
669+
* A little optimization trick is done here. If there's only one
670670
* argument, there's no need to scan the string for printf formats.
671671
* The trace_puts() will suffice. But how can we take advantage of
672672
* using trace_puts() when trace_printk() has only one argument?

tools/objtool/check.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,
164164
"lbug_with_loc",
165165
"fortify_panic",
166166
"usercopy_abort",
167+
"machine_real_restart",
167168
};
168169

169170
if (func->bind == STB_WEAK)

0 commit comments

Comments
 (0)