From owner-svn-src-all@FreeBSD.ORG Sun Jan 5 19:07:42 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA9C3C0E; Sun, 5 Jan 2014 19:07:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C71A11AB3; Sun, 5 Jan 2014 19:07:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s05J7gs1030184; Sun, 5 Jan 2014 19:07:42 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s05J7gGW030183; Sun, 5 Jan 2014 19:07:42 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201401051907.s05J7gGW030183@svn.freebsd.org> From: Alexander Motin Date: Sun, 5 Jan 2014 19:07:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260328 - head/sys/cddl/compat/opensolaris/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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: Sun, 05 Jan 2014 19:07:42 -0000 Author: mav Date: Sun Jan 5 19:07:42 2014 New Revision: 260328 URL: http://svnweb.freebsd.org/changeset/base/260328 Log: Fix build after r260234 by converting ddi_get_lbolt64() from inline into a macro. Otherwise compiler complains that hz variable used there either undefined or defined twice, thanks to header mess caused by compat shims. Modified: head/sys/cddl/compat/opensolaris/sys/time.h Modified: head/sys/cddl/compat/opensolaris/sys/time.h ============================================================================== --- head/sys/cddl/compat/opensolaris/sys/time.h Sun Jan 5 18:46:58 2014 (r260327) +++ head/sys/cddl/compat/opensolaris/sys/time.h Sun Jan 5 19:07:42 2014 (r260328) @@ -70,21 +70,10 @@ gethrtime(void) { #define gethrtime_waitfree() gethrtime() extern int nsec_per_tick; /* nanoseconds per clock tick */ -extern int hz; /* clock ticks per second */ -static __inline int64_t -ddi_get_lbolt64(void) -{ - - return (((getsbinuptime() >> 16) * hz) >> 16); -} - -static __inline clock_t -ddi_get_lbolt(void) -{ - - return (ddi_get_lbolt64()); -} +#define ddi_get_lbolt64() \ + (int64_t)(((getsbinuptime() >> 16) * hz) >> 16) +#define ddi_get_lbolt() (clock_t)ddi_get_lbolt64() #else