diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-09 09:22:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-09 09:22:42 -0800 |
| commit | c4703acd6d4a58dc4b31ad2a8f8b14becb898d25 (patch) | |
| tree | 722bea1c4e9dc4230e7a2828a52fb4d5a55214b3 /include/linux/printk.h | |
| parent | Merge tag 'linux-kselftest-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest (diff) | |
| parent | printk/docs: Add extra integer types to printk-formats (diff) | |
| download | linux-dev-c4703acd6d4a58dc4b31ad2a8f8b14becb898d25.tar.xz linux-dev-c4703acd6d4a58dc4b31ad2a8f8b14becb898d25.zip | |
Merge tag 'printk-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk updates from Petr Mladek:
- Allow to sort mixed lines by an extra information about the caller
- Remove no longer used LOG_PREFIX.
- Some clean up and documentation update.
* tag 'printk-for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
printk/docs: Add extra integer types to printk-formats
printk: Remove no longer used LOG_PREFIX.
lib/vsprintf: Remove %pCr remnant in comment
printk: Pass caller information to log_store().
printk: Add caller information to printk() output.
Diffstat (limited to 'include/linux/printk.h')
| -rw-r--r-- | include/linux/printk.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 02b5c115d89b..d7c77ed1a4cb 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -18,7 +18,6 @@ static inline int printk_get_level(const char *buffer) if (buffer[0] == KERN_SOH_ASCII && buffer[1]) { switch (buffer[1]) { case '0' ... '7': - case 'd': /* KERN_DEFAULT */ case 'c': /* KERN_CONT */ return buffer[1]; } |