From owner-svn-src-all@FreeBSD.ORG  Sat Dec  5 17:08:45 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 854B01065672;
	Sat,  5 Dec 2009 17:08:45 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73E218FC0C;
	Sat,  5 Dec 2009 17:08:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB5H8jku093560;
	Sat, 5 Dec 2009 17:08:45 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB5H8jdC093558;
	Sat, 5 Dec 2009 17:08:45 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200912051708.nB5H8jdC093558@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 5 Dec 2009 17:08:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200128 - stable/7/sys/dev/hwpmc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Dec 2009 17:08:45 -0000

Author: emaste
Date: Sat Dec  5 17:08:45 2009
New Revision: 200128
URL: http://svn.freebsd.org/changeset/base/200128

Log:
  MFC r200001:
  
    Fix parenthesis typo -- copy full frame pointer for userland callchain,
    not just one byte.
  
  Submitted by:        Ryan Stone      rysto32 at gmail dot com

Modified:
  stable/7/sys/dev/hwpmc/hwpmc_x86.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/hwpmc/hwpmc_x86.c
==============================================================================
--- stable/7/sys/dev/hwpmc/hwpmc_x86.c	Sat Dec  5 17:07:43 2009	(r200127)
+++ stable/7/sys/dev/hwpmc/hwpmc_x86.c	Sat Dec  5 17:08:45 2009	(r200128)
@@ -101,7 +101,7 @@ pmc_save_user_callchain(uintptr_t *cc, i
 		if (copyin((void *) sp, &pc, sizeof(pc)) != 0)
 			return (n);
 	} else if (copyin((void *) r, &pc, sizeof(pc)) != 0 ||
-	    copyin((void *) fp, &fp, sizeof(fp) != 0))
+	    copyin((void *) fp, &fp, sizeof(fp)) != 0)
 		return (n);
 
 	for (; n < nframes;) {