diff options
author | Tejun Heo <tj@kernel.org> | 2024-07-30 21:30:11 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2024-07-30 21:30:11 +0200 |
commit | c8faf11cd192214e231626c3ee973a35d8fc33f2 (patch) | |
tree | 4c3fcfddf4c7c311e1856dbf4dac1240564731f1 /lib/dump_stack.c | |
parent | sched_ext: Fixes incorrect type in bpf_scx_init() (diff) | |
parent | Linux 6.11-rc1 (diff) | |
download | linux-c8faf11cd192214e231626c3ee973a35d8fc33f2.tar.xz linux-c8faf11cd192214e231626c3ee973a35d8fc33f2.zip |
Merge tag 'v6.11-rc1' into for-6.12
Linux 6.11-rc1
Diffstat (limited to 'lib/dump_stack.c')
-rw-r--r-- | lib/dump_stack.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/dump_stack.c b/lib/dump_stack.c index 9581ef4efec5..388da1aea14a 100644 --- a/lib/dump_stack.c +++ b/lib/dump_stack.c @@ -54,14 +54,19 @@ void __init dump_stack_set_arch_desc(const char *fmt, ...) */ void dump_stack_print_info(const char *log_lvl) { - printk("%sCPU: %d PID: %d Comm: %.20s %s%s %s %.*s" BUILD_ID_FMT "\n", - log_lvl, raw_smp_processor_id(), current->pid, current->comm, + printk("%sCPU: %d UID: %u PID: %d Comm: %.20s %s%s %s %.*s" BUILD_ID_FMT "\n", + log_lvl, raw_smp_processor_id(), + __kuid_val(current_real_cred()->euid), + current->pid, current->comm, kexec_crash_loaded() ? "Kdump: loaded " : "", print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version, BUILD_ID_VAL); + if (get_taint()) + printk("%s%s\n", log_lvl, print_tainted_verbose()); + if (dump_stack_arch_desc_str[0] != '\0') printk("%sHardware name: %s\n", log_lvl, dump_stack_arch_desc_str); |