From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759255AbZEKVBm (ORCPT ); Mon, 11 May 2009 17:01:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753063AbZEKVBd (ORCPT ); Mon, 11 May 2009 17:01:33 -0400 Received: from mx2.redhat.com ([66.187.237.31]:54317 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752838AbZEKVBc (ORCPT ); Mon, 11 May 2009 17:01:32 -0400 From: Masami Hiramatsu Subject: [PATCH -rc] [BUGFIX] x86: fix kernel_trap_sp() To: Linus Torvalds Cc: LKML , systemtap@sources.redhat.com, Masami Hiramatsu , Harvey Harrison , Ingo Molnar , Thomas Gleixner , Jan Blunck , Christoph Hellwig Date: Mon, 11 May 2009 17:03:00 -0400 Message-ID: <20090511210300.17332.67549.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 Cc: Christoph Hellwig --- 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