From: Chuck Ebbert <76306.1226@compuserve.com> Show first field of kernel version in register dumps like x86_64 does. Changes output from e.g.: (2.6.16-rc1) to: (2.6.16-rc1 #12) Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton --- arch/i386/kernel/process.c | 6 ++++-- arch/i386/kernel/traps.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff -puN arch/i386/kernel/process.c~i386-print-kernel-version-in-register arch/i386/kernel/process.c --- devel/arch/i386/kernel/process.c~i386-print-kernel-version-in-register 2006-01-18 20:26:00.000000000 -0800 +++ devel-akpm/arch/i386/kernel/process.c 2006-01-18 20:26:00.000000000 -0800 @@ -297,8 +297,10 @@ void show_regs(struct pt_regs * regs) if (user_mode(regs)) printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp); - printk(" EFLAGS: %08lx %s (%s)\n", - regs->eflags, print_tainted(), system_utsname.release); + printk(" EFLAGS: %08lx %s (%s %.*s)\n", + regs->eflags, print_tainted(), system_utsname.release, + (int)strcspn(system_utsname.version, " "), + system_utsname.version); printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", regs->eax,regs->ebx,regs->ecx,regs->edx); printk("ESI: %08lx EDI: %08lx EBP: %08lx", diff -puN arch/i386/kernel/traps.c~i386-print-kernel-version-in-register arch/i386/kernel/traps.c --- devel/arch/i386/kernel/traps.c~i386-print-kernel-version-in-register 2006-01-18 20:26:00.000000000 -0800 +++ devel-akpm/arch/i386/kernel/traps.c 2006-01-18 20:26:00.000000000 -0800 @@ -261,9 +261,11 @@ void show_registers(struct pt_regs *regs } print_modules(); printk(KERN_EMERG "CPU: %d\nEIP: %04x:[<%08lx>] %s VLI\n" - "EFLAGS: %08lx (%s) \n", + "EFLAGS: %08lx (%s %.*s) \n", smp_processor_id(), 0xffff & regs->xcs, regs->eip, - print_tainted(), regs->eflags, system_utsname.release); + print_tainted(), regs->eflags, system_utsname.release, + (int)strcspn(system_utsname.version, " "), + system_utsname.version); print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip); printk(KERN_EMERG "eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n", regs->eax, regs->ebx, regs->ecx, regs->edx); _