From owner-svn-src-all@FreeBSD.ORG Fri Jul 16 06:09:51 2010 Return-Path: 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 C47161065670; Fri, 16 Jul 2010 06:09:51 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B360B8FC13; Fri, 16 Jul 2010 06:09:51 +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 o6G69pS2022059; Fri, 16 Jul 2010 06:09:51 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6G69p6v022058; Fri, 16 Jul 2010 06:09:51 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201007160609.o6G69p6v022058@svn.freebsd.org> From: Warner Losh Date: Fri, 16 Jul 2010 06:09:51 +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: r210158 - head/sys/mips/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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2010 06:09:51 -0000 Author: imp Date: Fri Jul 16 06:09:51 2010 New Revision: 210158 URL: http://svn.freebsd.org/changeset/base/210158 Log: Use #define for get_cyclecount rather than inline function. mips_rd_count() isn't defined in userland, and cpu.h is included there in alias_scpt.h (maybe they don't need it in the first place). Modified: head/sys/mips/include/cpu.h Modified: head/sys/mips/include/cpu.h ============================================================================== --- head/sys/mips/include/cpu.h Fri Jul 16 04:27:38 2010 (r210157) +++ head/sys/mips/include/cpu.h Fri Jul 16 06:09:51 2010 (r210158) @@ -78,11 +78,7 @@ /* * A machine-independent interface to the CPU's counter. */ -static __inline uint64_t -get_cyclecount(void) -{ - return (mips_rd_count()); -} +#define get_cyclecount() mips_rd_count() #endif /* !_LOCORE */ #if defined(_KERNEL) && !defined(_LOCORE)