diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/alpha/kernel/traps.c linux-3.9.4-vs2.3.6.4/arch/alpha/kernel/traps.c --- linux-3.9.4-vs2.3.6.3/arch/alpha/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/alpha/kernel/traps.c 2013-06-12 09:32:34.000000000 +0000 @@ -184,7 +184,7 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); #endif - printk("%s(%d[#%u]): %s %ld\n", current->comm, + printk("%s(%d:#%u): %s %ld\n", current->comm, task_pid_nr(current), current->xid, str, err); dik_show_regs(regs, r9_15); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/arm/kernel/process.c linux-3.9.4-vs2.3.6.4/arch/arm/kernel/process.c --- linux-3.9.4-vs2.3.6.3/arch/arm/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/arm/kernel/process.c 2013-06-12 09:33:04.000000000 +0000 @@ -332,7 +332,7 @@ void __show_regs(struct pt_regs *regs) void show_regs(struct pt_regs * regs) { printk("\n"); - printk("Pid: %d[#%u], comm: %20s\n", + printk("Pid: %d:#%u, comm: %20s\n", task_pid_nr(current), current->xid, current->comm); __show_regs(regs); dump_stack(); diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/process.c linux-3.9.4-vs2.3.6.4/arch/ia64/kernel/process.c --- linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/ia64/kernel/process.c 2013-06-12 09:33:32.000000000 +0000 @@ -109,7 +109,7 @@ show_regs (struct pt_regs *regs) unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; print_modules(); - printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current), + printk("\nPid: %d:#%u, CPU %d, comm: %20s\n", task_pid_nr(current), current->xid, smp_processor_id(), current->comm); printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/traps.c linux-3.9.4-vs2.3.6.4/arch/ia64/kernel/traps.c --- linux-3.9.4-vs2.3.6.3/arch/ia64/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/ia64/kernel/traps.c 2013-06-12 09:33:50.000000000 +0000 @@ -60,7 +60,7 @@ die (const char *str, struct pt_regs *re put_cpu(); if (++die.lock_owner_depth < 3) { - printk("%s[%d[#%u]]: %s %ld [%d]\n", + printk("%s[%d:#%u]: %s %ld [%d]\n", current->comm, task_pid_nr(current), current->xid, str, err, ++die_counter); if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) @@ -325,7 +325,7 @@ handle_fpu_swa (int fp_fault, struct pt_ if ((last.count & 15) < 5 && (ia64_fetchadd(1, &last.count, acq) & 15) < 5) { last.time = current_jiffies + 5 * HZ; printk(KERN_WARNING - "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n", + "%s(%d:#%u): floating-point assist fault at ip %016lx, isr %016lx\n", current->comm, task_pid_nr(current), current->xid, regs->cr_iip + ia64_psr(regs)->ri, isr); } diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/m32r/kernel/traps.c linux-3.9.4-vs2.3.6.4/arch/m32r/kernel/traps.c --- linux-3.9.4-vs2.3.6.3/arch/m32r/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/m32r/kernel/traps.c 2013-06-12 09:33:58.000000000 +0000 @@ -195,7 +195,7 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); } - printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)", + printk("Process %s (pid: %d:#%u, process nr: %d, stackpage=%08lx)", current->comm, task_pid_nr(current), current->xid, 0xffff & i, 4096+(unsigned long)current); diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/process.c linux-3.9.4-vs2.3.6.4/arch/powerpc/kernel/process.c --- linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/process.c 2013-05-31 14:47:11.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/powerpc/kernel/process.c 2013-06-12 09:34:39.000000000 +0000 @@ -850,7 +850,7 @@ void show_regs(struct pt_regs * regs) #else printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); #endif - printk("TASK = %p[%d,#%u] '%s' THREAD: %p", + printk("TASK = %p[%d:#%u] '%s' THREAD: %p", current, task_pid_nr(current), current->xid, current->comm, task_thread_info(current)); diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/traps.c linux-3.9.4-vs2.3.6.4/arch/powerpc/kernel/traps.c --- linux-3.9.4-vs2.3.6.3/arch/powerpc/kernel/traps.c 2013-05-31 14:47:11.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/powerpc/kernel/traps.c 2013-06-12 09:34:47.000000000 +0000 @@ -1167,7 +1167,7 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) { - printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", + printk("Task: %p(%d:#%u), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", current, task_pid_nr(current), current->xid, regs->nip, regs->link, regs->gpr[0], regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/x86/kernel/dumpstack.c linux-3.9.4-vs2.3.6.4/arch/x86/kernel/dumpstack.c --- linux-3.9.4-vs2.3.6.3/arch/x86/kernel/dumpstack.c 2013-05-31 13:44:49.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/x86/kernel/dumpstack.c 2013-06-12 11:03:19.000000000 +0000 @@ -188,8 +188,8 @@ void dump_stack(void) unsigned long stack; bp = stack_frame(current, NULL); - printk("Pid: %d, comm: %.20s %s %s %.*s\n", - current->pid, current->comm, print_tainted(), + printk("Pid: %d:#%u, comm: %.20s %s %s %.*s\n", + current->pid, current->xid, current->comm, print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version); diff -NurpP --minimal linux-3.9.4-vs2.3.6.3/arch/x86/kernel/process.c linux-3.9.4-vs2.3.6.4/arch/x86/kernel/process.c --- linux-3.9.4-vs2.3.6.3/arch/x86/kernel/process.c 2013-05-31 13:44:49.000000000 +0000 +++ linux-3.9.4-vs2.3.6.4/arch/x86/kernel/process.c 2013-06-12 11:02:45.000000000 +0000 @@ -135,8 +135,8 @@ void show_regs_common(void) /* Board Name is optional */ board = dmi_get_system_info(DMI_BOARD_NAME); - printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s\n", - current->pid, current->comm, print_tainted(), + printk(KERN_DEFAULT "Pid: %d:#%u, comm: %.20s %s %s %.*s %s %s%s%s\n", + current->pid, current->xid, current->comm, print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version,