From owner-svn-src-user@FreeBSD.ORG  Fri May 22 18:30:00 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4001C106564A;
	Fri, 22 May 2009 18:30:00 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DC898FC18;
	Fri, 22 May 2009 18:30:00 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4MIU0Wo014987;
	Fri, 22 May 2009 18:30:00 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4MIU0wL014986;
	Fri, 22 May 2009 18:30:00 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905221830.n4MIU0wL014986@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 22 May 2009 18:30:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192594 - user/kmacy/releng_7_2_fcs/sys/dev/hwpmc
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 May 2009 18:30:00 -0000

Author: kmacy
Date: Fri May 22 18:29:59 2009
New Revision: 192594
URL: http://svn.freebsd.org/changeset/base/192594

Log:
  update trapframe sp macro

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_x86.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_x86.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_x86.c	Fri May 22 18:26:47 2009	(r192593)
+++ user/kmacy/releng_7_2_fcs/sys/dev/hwpmc/hwpmc_x86.c	Fri May 22 18:29:59 2009	(r192594)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005, Joseph Koshy
+ * Copyright (c) 2005,2008 Joseph Koshy
  * Copyright (c) 2007 The FreeBSD Foundation
  * All rights reserved.
  *
@@ -91,7 +91,7 @@ pmc_save_user_callchain(uintptr_t *cc, i
 
 	pc = PMC_TRAPFRAME_TO_PC(tf);
 	oldfp = fp = PMC_TRAPFRAME_TO_FP(tf);
-	sp = PMC_TRAPFRAME_TO_SP(tf);
+	sp = PMC_TRAPFRAME_TO_USER_SP(tf);
 
 	*cc++ = pc; n = 1;
 
@@ -172,7 +172,7 @@ pmc_save_kernel_callchain(uintptr_t *cc,
 
 	pc = PMC_TRAPFRAME_TO_PC(tf);
 	fp = PMC_TRAPFRAME_TO_FP(tf);
-	sp = PMC_TRAPFRAME_TO_SP(tf);
+	sp = PMC_TRAPFRAME_TO_KERNEL_SP(tf);
 
 	*cc++ = pc;
 	r = fp + sizeof(uintptr_t); /* points to return address */