From owner-svn-src-head@FreeBSD.ORG  Thu Jun 11 04:41:55 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 000C5F84;
 Thu, 11 Jun 2015 04:41:54 +0000 (UTC) (envelope-from kib@FreeBSD.org)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E296F1456;
 Thu, 11 Jun 2015 04:41:54 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5B4fsFP003760;
 Thu, 11 Jun 2015 04:41:54 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5B4fsK5003759;
 Thu, 11 Jun 2015 04:41:54 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201506110441.t5B4fsK5003759@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 11 Jun 2015 04:41:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284256 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2015 04:41:55 -0000

Author: kib
Date: Thu Jun 11 04:41:54 2015
New Revision: 284256
URL: https://svnweb.freebsd.org/changeset/base/284256

Log:
  Tweaks for r284178:
  
  Do not include machine/atomic.h explicitely, the header is already included
  by sys/systm.h.
  
  Force inlining of tc_getgen() and tc_setgen().  The functions are used
  more than once, which causes compilers with non-aggressive inlining
  policies to generate calls.
  
  Suggested by:	bde
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/kern/kern_tc.c

Modified: head/sys/kern/kern_tc.c
==============================================================================
--- head/sys/kern/kern_tc.c	Thu Jun 11 04:22:17 2015	(r284255)
+++ head/sys/kern/kern_tc.c	Thu Jun 11 04:41:54 2015	(r284256)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/timetc.h>
 #include <sys/timex.h>
 #include <sys/vdso.h>
-#include <machine/atomic.h>
 
 /*
  * A large step happens on boot.  This constant detects such steps.
@@ -190,7 +189,7 @@ tc_delta(struct timehands *th)
 	    tc->tc_counter_mask);
 }
 
-static u_int
+static inline u_int
 tc_getgen(struct timehands *th)
 {
 
@@ -205,7 +204,7 @@ tc_getgen(struct timehands *th)
 #endif
 }
 
-static void
+static inline void
 tc_setgen(struct timehands *th, u_int newgen)
 {