From 8ebfae1ea4980bd52fee06baa9cd02ab3e17e27e Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 12 Sep 2005 18:49:24 +0200 Subject: [PATCH] --- yaml --- r: 8597 b: refs/heads/master c: 9acf23c42b13d682abbd5db1d293c7a77ae54b61 h: refs/heads/master i: 8595: a1cd129d6d0cf6f2cba6cea98301691279714d2f v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/process.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9b0d3ea5794..32822f419c97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69e1a33f62eff9b228a8cc2c3e4429dbee8966c9 +refs/heads/master: 9acf23c42b13d682abbd5db1d293c7a77ae54b61 diff --git a/trunk/arch/x86_64/kernel/process.c b/trunk/arch/x86_64/kernel/process.c index 8661f82ac70b..b19cee6a12e6 100644 --- a/trunk/arch/x86_64/kernel/process.c +++ b/trunk/arch/x86_64/kernel/process.c @@ -271,8 +271,11 @@ void __show_regs(struct pt_regs * regs) printk("\n"); print_modules(); - printk("Pid: %d, comm: %.20s %s %s\n", - current->pid, current->comm, print_tainted(), system_utsname.release); + printk("Pid: %d, comm: %.20s %s %s %.*s\n", + current->pid, current->comm, print_tainted(), + system_utsname.release, + (int)strcspn(system_utsname.version, " "), + system_utsname.version); printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip); printk_address(regs->rip); printk("\nRSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->rsp, regs->eflags);