From owner-freebsd-current@FreeBSD.ORG  Mon Jul 15 14:01:28 2013
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2D52C23C;
 Mon, 15 Jul 2013 14:01:28 +0000 (UTC) (envelope-from ianf@clue.co.za)
Received: from zcs04.jnb1.cloudseed.co.za (zcs04.jnb1.cloudseed.co.za
 [41.154.0.161]) by mx1.freebsd.org (Postfix) with ESMTP id BFAD8C50;
 Mon, 15 Jul 2013 14:01:27 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
 by zcs04.jnb1.cloudseed.co.za (Postfix) with ESMTP id 6CBE92A832AF;
 Mon, 15 Jul 2013 16:01:24 +0200 (SAST)
X-Virus-Scanned: amavisd-new at zcs04.jnb1.cloudseed.co.za
Received: from zcs04.jnb1.cloudseed.co.za ([127.0.0.1])
 by localhost (zcs04.jnb1.cloudseed.co.za [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id rF1lOne9zxAW; Mon, 15 Jul 2013 16:01:23 +0200 (SAST)
Received: from clue.co.za (41-135-71-48.dsl.mweb.co.za [41.135.71.48])
 by zcs04.jnb1.cloudseed.co.za (Postfix) with ESMTPSA id 9DCAC2A83265;
 Mon, 15 Jul 2013 16:01:23 +0200 (SAST)
Received: from localhost ([127.0.0.1] helo=zen)
 by clue.co.za with esmtp (Exim 4.80.1 (FreeBSD))
 (envelope-from <ianf@clue.co.za>)
 id 1UyjL7-00012X-W2; Mon, 15 Jul 2013 16:01:22 +0200
To: current@freebsd.org
Subject: r253351 implicit definition of 'critical_exit'.
From: "Ian FREISLICH" <ianf@clue.co.za>
X-Attribution: BOFH
Date: Mon, 15 Jul 2013 16:01:21 +0200
Message-Id: <E1UyjL7-00012X-W2@clue.co.za>
Cc: ae@freebsd.org
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jul 2013 14:01:28 -0000

Hi

Recent change:
-----
# svn log ./sys/sys/sf_buf.h |less
------------------------------------------------------------------------
r253351 | ae | 2013-07-15 08:16:57 +0200 (Mon, 15 Jul 2013) | 6 lines

Introduce new structure sfstat for collecting sendfile's statistics
and remove corresponding fields from struct mbstat. Use PCPU counters
and SFSTAT_INC() macro for update these statistics.
-----

Includes sys/counter.h in sys/sf_buf.h.  sys/counter.h uses macros
defined in sys/systm.h resulting in implicit definitions of
critical_exit and others and then errors in conflicting types for
critical_exit later when sys/system.h is includd _after_ sys/sf_buf.h
in sys/i386/i386/uio_machdep.c.

I haven't checked amd64 yet, but this patch fixes the build:

Index: /usr/src/sys/i386/i386/uio_machdep.c
===================================================================
--- /usr/src/sys/i386/i386/uio_machdep.c        (revision 253361)
+++ /usr/src/sys/i386/i386/uio_machdep.c        (working copy)
@@ -44,8 +44,8 @@
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/sched.h>
+#include <sys/systm.h>
 #include <sys/sf_buf.h>
-#include <sys/systm.h>
 #include <sys/uio.h>
 
 #include <vm/vm.h>

However, sys/system.h coul equally be included in sys/sf_buf.h
before sys/counter.h.  I don't know which is the correct fix.

Ian

-- 
Ian Freislich