From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932323AbcJUHwa (ORCPT ); Fri, 21 Oct 2016 03:52:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35360 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754369AbcJUHwC (ORCPT ); Fri, 21 Oct 2016 03:52:02 -0400 Date: Fri, 21 Oct 2016 00:51:14 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: bp@alien8.de, linux-kernel@vger.kernel.org, luto@kernel.org, brgerst@gmail.com, torvalds@linux-foundation.org, mingo@kernel.org, jpoimboe@redhat.com, hpa@zytor.com, tglx@linutronix.de, dvlasenk@redhat.com, peterz@infradead.org Reply-To: brgerst@gmail.com, luto@kernel.org, torvalds@linux-foundation.org, bp@alien8.de, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, jpoimboe@redhat.com In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/dumpstack: Fix duplicate RIP address display in __show_regs() Git-Commit-ID: 1141c3e39c64e4aba2d98cb3dcca95369c9dafbe X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1141c3e39c64e4aba2d98cb3dcca95369c9dafbe Gitweb: http://git.kernel.org/tip/1141c3e39c64e4aba2d98cb3dcca95369c9dafbe Author: Josh Poimboeuf AuthorDate: Thu, 20 Oct 2016 11:34:44 -0500 Committer: Ingo Molnar CommitDate: Fri, 21 Oct 2016 09:26:04 +0200 x86/dumpstack: Fix duplicate RIP address display in __show_regs() The RIP address is shown twice in __show_regs(). Before: RIP: 0010:[] [] native_write_msr+0x6/0x30 After: RIP: 0010:[] native_write_msr+0x6/0x30 Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/b3fda66f36761759b000883b059cdd9a7649dcc1.1476973742.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/process_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index b3760b3..b3b50ac 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -61,8 +61,8 @@ void __show_regs(struct pt_regs *regs, int all) unsigned int fsindex, gsindex; unsigned int ds, cs, es; - printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip); - printk_address(regs->ip); + printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] %pS\n", regs->cs & 0xffff, + regs->ip, (void *)regs->ip); printk(KERN_DEFAULT "RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->sp, regs->flags); printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",