From patchwork Sat May 9 00:49:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masami Hiramatsu X-Patchwork-Id: 22686 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4912P1d003647 for ; Sat, 9 May 2009 01:02:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764627AbZEIAqU (ORCPT ); Fri, 8 May 2009 20:46:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764617AbZEIAqS (ORCPT ); Fri, 8 May 2009 20:46:18 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55690 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764483AbZEIAqJ (ORCPT ); Fri, 8 May 2009 20:46:09 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n490juhI032632; Fri, 8 May 2009 20:45:56 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n490jtg3032054; Fri, 8 May 2009 20:45:56 -0400 Received: from localhost.localdomain (dhcp-100-3-156.bos.redhat.com [10.16.3.156]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n490jsv1024497; Fri, 8 May 2009 20:45:54 -0400 From: Masami Hiramatsu Subject: [PATCH -tip v5 5/7] x86: fix kernel_trap_sp() To: Ingo Molnar , Steven Rostedt , lkml Cc: systemtap , kvm , Masami Hiramatsu , Harvey Harrison , Ingo Molnar , Thomas Gleixner , Jan Blunck Date: Fri, 08 May 2009 20:49:04 -0400 Message-ID: <20090509004904.5505.59034.stgit@localhost.localdomain> In-Reply-To: <20090509004829.5505.38720.stgit@localhost.localdomain> References: <20090509004829.5505.38720.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use ®s->sp instead of regs for getting the top of stack in kernel mode. (on x86-64, regs->sp always points the top of stack) [ impact: Oprofile decodes only stack for backtracing on i386 ] Signed-off-by: Masami Hiramatsu Cc: Harvey Harrison Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Jan Blunck --- arch/x86/include/asm/ptrace.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 5cdd19f..90b76b3 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -187,14 +187,14 @@ static inline int v8086_mode(struct pt_regs *regs) /* * X86_32 CPUs don't save ss and esp if the CPU is already in kernel mode - * when it traps. So regs will be the current sp. + * when it traps. So ®s->sp will be the current sp. * * This is valid only for kernel mode traps. */ static inline unsigned long kernel_trap_sp(struct pt_regs *regs) { #ifdef CONFIG_X86_32 - return (unsigned long)regs; + return (unsigned long)®s->sp; #else return regs->sp; #endif