tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds d3a6749c d4e860ea

+2 -1
+1 -1
include/linux/kernel.h
··· 666 666 * your code. (Extra memory is used for special buffers that are 667 667 * allocated when trace_printk() is used.) 668 668 * 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 670 670 * argument, there's no need to scan the string for printf formats. 671 671 * The trace_puts() will suffice. But how can we take advantage of 672 672 * using trace_puts() when trace_printk() has only one argument?
+1
tools/objtool/check.c
··· 164 164 "lbug_with_loc", 165 165 "fortify_panic", 166 166 "usercopy_abort", 167 + "machine_real_restart", 167 168 }; 168 169 169 170 if (func->bind == STB_WEAK)