Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux.git] / arch / x86 / kernel / process_32.c

diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 7dc8c9c3d8019e21315f54e97f7b25bffe1de7e0..f854404be1c6ae91b4fd85190daba78920f3f962 100644 (file)
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -72,10 +72,9 @@ void __show_regs(struct pt_regs *regs, int all)
                savesegment(gs, gs);
        }
 
-       printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
-                       (u16)regs->cs, regs->ip, regs->flags,
-                       smp_processor_id());
-       print_symbol("EIP is at %s\n", regs->ip);
+       printk(KERN_DEFAULT "EIP: %pS\n", (void *)regs->ip);
+       printk(KERN_DEFAULT "EFLAGS: %08lx CPU: %d\n", regs->flags,
+               smp_processor_id());
 
        printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
                regs->ax, regs->bx, regs->cx, regs->dx);