diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 11:11:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 11:11:26 -0700 |
| commit | eed1fc87795362fd868bdc960d7b96d25f81eae3 (patch) | |
| tree | c9299d4ea8c79a42ea48510d168ae40597d4bcc5 /arch/x86/power | |
| parent | 19964541c23156cc8f814a2137df6b833ccdbf12 (diff) | |
| parent | a5707eef798b57ff5a2e56fca435dff616019b7e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk updates from Petr Mladek:
- Store printk() messages into the main log buffer directly even in NMI
when the lock is available. It is the best effort to print even large
chunk of text. It is handy, for example, when all ftrace messages are
printed during the system panic in NMI.
- Add missing annotations to calm down compiler warnings
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
printk: add __printf attributes to internal functions
printk: Use the main logbuf in NMI when logbuf_lock is available
Diffstat (limited to 'arch/x86/power')
0 files changed, 0 insertions, 0 deletions