Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a6749c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d4e860ea 8730662d

include/linux/kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -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?

tools/objtool/check.c

+1 −0
Original line number Diff line number Diff line
@@ -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)