diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-10 23:06:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-10 23:06:46 +0200 |
| commit | 95c4629d92d15d10e5f7c55bfb72583f96a91374 (patch) | |
| tree | ef9b973bfbf9f85659f4fc2794d8271bd19c4857 /arch/x86/kernel/process_32.c | |
| parent | Merge branch 'sparc64-queued-locks' (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-95c4629d92d15d10e5f7c55bfb72583f96a91374.tar.xz linux-95c4629d92d15d10e5f7c55bfb72583f96a91374.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'arch/x86/kernel/process_32.c')
| -rw-r--r-- | arch/x86/kernel/process_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index ff40e74c9181..ffeae818aa7a 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -78,7 +78,7 @@ void __show_regs(struct pt_regs *regs, int all) printk(KERN_DEFAULT "EIP: %pS\n", (void *)regs->ip); printk(KERN_DEFAULT "EFLAGS: %08lx CPU: %d\n", regs->flags, - smp_processor_id()); + raw_smp_processor_id()); printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", regs->ax, regs->bx, regs->cx, regs->dx); |