diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-09 12:22:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-09 12:22:42 -0500 |
commit | c4703acd6d4a58dc4b31ad2a8f8b14becb898d25 (patch) | |
tree | 722bea1c4e9dc4230e7a2828a52fb4d5a55214b3 /lib/Kconfig.debug | |
parent | a448c643bc49f14bb3aae68ee7085b4c7f6207d8 (diff) | |
parent | 943ca6ad81e5b37bd5d22cbab5ad06dc97fc001c (diff) |
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 'lib/Kconfig.debug')
-rw-r--r-- | lib/Kconfig.debug | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index e718487c97c3..91ed81250fb3 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -17,6 +17,23 @@ config PRINTK_TIME | |||
17 | The behavior is also controlled by the kernel command line | 17 | The behavior is also controlled by the kernel command line |
18 | parameter printk.time=1. See Documentation/admin-guide/kernel-parameters.rst | 18 | parameter printk.time=1. See Documentation/admin-guide/kernel-parameters.rst |
19 | 19 | ||
20 | config PRINTK_CALLER | ||
21 | bool "Show caller information on printks" | ||
22 | depends on PRINTK | ||
23 | help | ||
24 | Selecting this option causes printk() to add a caller "thread id" (if | ||
25 | in task context) or a caller "processor id" (if not in task context) | ||
26 | to every message. | ||
27 | |||
28 | This option is intended for environments where multiple threads | ||
29 | concurrently call printk() for many times, for it is difficult to | ||
30 | interpret without knowing where these lines (or sometimes individual | ||
31 | line which was divided into multiple lines due to race) came from. | ||
32 | |||
33 | Since toggling after boot makes the code racy, currently there is | ||
34 | no option to enable/disable at the kernel command line parameter or | ||
35 | sysfs interface. | ||
36 | |||
20 | config CONSOLE_LOGLEVEL_DEFAULT | 37 | config CONSOLE_LOGLEVEL_DEFAULT |
21 | int "Default console loglevel (1-15)" | 38 | int "Default console loglevel (1-15)" |
22 | range 1 15 | 39 | range 1 15 |