From owner-svn-src-all@FreeBSD.ORG  Thu Jul  1 00:30:35 2010
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 EC583106564A;
	Thu,  1 Jul 2010 00:30:35 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DB1938FC19;
	Thu,  1 Jul 2010 00:30:35 +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 o610UZgb005771;
	Thu, 1 Jul 2010 00:30:35 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o610UZth005769;
	Thu, 1 Jul 2010 00:30:35 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201007010030.o610UZth005769@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 1 Jul 2010 00:30:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209618 - head/sys/ia64/include
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: Thu, 01 Jul 2010 00:30:36 -0000

Author: marcel
Date: Thu Jul  1 00:30:35 2010
New Revision: 209618
URL: http://svn.freebsd.org/changeset/base/209618

Log:
  When compiling with profiling, we define PROF for userspace and GPROF
  for the kernel.

Modified:
  head/sys/ia64/include/asm.h

Modified: head/sys/ia64/include/asm.h
==============================================================================
--- head/sys/ia64/include/asm.h	Wed Jun 30 22:29:02 2010	(r209617)
+++ head/sys/ia64/include/asm.h	Thu Jul  1 00:30:35 2010	(r209618)
@@ -43,7 +43,7 @@
 /*
  * MCOUNT
  */
-#if defined(GPROF)
+#if defined(PROF) || (defined(_KERNEL) && defined(GPROF))
 #define	MCOUNT					\
 	alloc	out0 = ar.pfs, 8, 0, 4, 0;	\
 	mov	out1 = r1;			\