Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757526AbZCUBdV (ORCPT ); Fri, 20 Mar 2009 21:33:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752443AbZCUBdE (ORCPT ); Fri, 20 Mar 2009 21:33:04 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37111 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753670AbZCUBdA (ORCPT ); Fri, 20 Mar 2009 21:33:00 -0400 Message-ID: <49C443F4.4080107@redhat.com> Date: Fri, 20 Mar 2009 21:33:40 -0400 From: Masami Hiramatsu User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Ingo Molnar , Harvey Harrison , Thomas Gleixner , Jan Blunck CC: LKML , systemtap-ml , Ananth N Mavinakayanahalli , Steven Rostedt , Frederic Weisbecker Subject: [RFC][PATCH -tip 2/5 V2] x86: fix kernel_trap_sp() X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1506 Lines: 50 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) 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 e304b66..aed0894 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 -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: mhiramat@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/