On (20/07/18 01:54), John Ogness wrote: > --- > kernel/printk/printk.c | 114 ++++------------------------------------- > 1 file changed, 11 insertions(+), 103 deletions(-) > > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > index fec71229169e..c4274c867771 100644 > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -495,9 +495,14 @@ static void truncate_msg(u16 *text_len, u16 *trunc_msg_len) > *trunc_msg_len = 0; > } > > +static inline u32 printk_caller_id(void) > +{ > + return in_task() ? task_pid_nr(current) : > + 0x80000000 + raw_smp_processor_id(); > +} Can we merge lines that we don't want to merge? pr_cont() -> IRQ -> pr_cont() -> NMI -> pr_cont() |__________________________________| different same 0x80000000 + cpu_id caller id caller id -ss _______________________________________________ kexec mailing list kexec@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/kexec