From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758239AbZEKVxY (ORCPT ); Mon, 11 May 2009 17:53:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754584AbZEKVxP (ORCPT ); Mon, 11 May 2009 17:53:15 -0400 Received: from hera.kernel.org ([140.211.167.34]:39490 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753523AbZEKVxO (ORCPT ); Mon, 11 May 2009 17:53:14 -0400 Date: Mon, 11 May 2009 21:51:44 GMT From: tip-bot for Masami Hiramatsu To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, torvalds@linux-foundation.org, jblunck@suse.de, hch@infradead.org, tglx@linutronix.de, mhiramat@redhat.com, harvey.harrison@gmail.com, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, jblunck@suse.de, hch@infradead.org, tglx@linutronix.de, harvey.harrison@gmail.com, mhiramat@redhat.com, mingo@elte.hu In-Reply-To: <20090511210300.17332.67549.stgit@localhost.localdomain> References: <20090511210300.17332.67549.stgit@localhost.localdomain> Subject: [tip:x86/urgent] x86, 32-bit: fix kernel_trap_sp() Message-ID: Git-Commit-ID: 11d0f25f06fb67e707e6ed4bf9967b859e403639 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Mon, 11 May 2009 21:51:46 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 11d0f25f06fb67e707e6ed4bf9967b859e403639 Gitweb: http://git.kernel.org/tip/11d0f25f06fb67e707e6ed4bf9967b859e403639 Author: Masami Hiramatsu AuthorDate: Mon, 11 May 2009 17:03:00 -0400 Committer: Ingo Molnar CommitDate: Mon, 11 May 2009 23:49:17 +0200 x86, 32-bit: fix kernel_trap_sp() 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: systemtap@sources.redhat.com Cc: Masami Hiramatsu Cc: Harvey Harrison Cc: Jan Blunck Cc: Christoph Hellwig Cc: Linus Torvalds LKML-Reference: <20090511210300.17332.67549.stgit@localhost.localdomain> Signed-off-by: Ingo Molnar --- 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