From owner-svn-src-head@freebsd.org Sun Apr 8 05:40:03 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1748FF83C01; Sun, 8 Apr 2018 05:40:03 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by mx1.freebsd.org (Postfix) with ESMTP id 8A0E56EB7D; Sun, 8 Apr 2018 05:40:01 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from [192.168.0.102] (c110-21-101-228.carlnfd1.nsw.optusnet.com.au [110.21.101.228]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id BA9D4D6AA31; Sun, 8 Apr 2018 15:39:52 +1000 (AEST) Date: Sun, 8 Apr 2018 15:39:52 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Cy Schubert cc: Jeff Roberson , Justin Hibbits , Jeff Roberson , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r331369 - head/sys/vm In-Reply-To: <201804072223.w37MNBQI009248@slippy.cwsent.com> Message-ID: <20180408153431.J1050@besplex.bde.org> References: <201804072223.w37MNBQI009248@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=cIaQihWN c=1 sm=1 tr=0 a=PalzARQSbocsUSjMRkwAPg==:117 a=PalzARQSbocsUSjMRkwAPg==:17 a=kj9zAlcOel0A:10 a=VxmjJ2MpAAAA:8 a=JzwRw_2MAAAA:8 a=GXryfc7mSUmSGEy9oAIA:9 a=CjuIK1q_8ugA:10 a=jDxBBm0fxBEA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=_bBvcJC8wCc67rcU61zu:22 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2018 05:40:03 -0000 On Sat, 7 Apr 2018, Cy Schubert wrote: > In message <201803230615.w2N6FTMJ040628@slippy.cwsent.com>, Cy Schubert > writes: >> In message <20180323150709.H968@besplex.bde.org>, Bruce Evans writes: >>> On Thu, 22 Mar 2018, Jeff Roberson wrote: >>> >>>> On Thu, 22 Mar 2018, Cy Schubert wrote: >>>> >>>>> It broke i386 too. >>>> >>>> I just did >>>> TARGET_ARCH=i386 make buildworld >>>> TARGET_ARCH=i386 make buildkernel >>>> >>>> This worked for me? >>>>> >>>>> Index: sys/vm/vm_reserv.c >>>>> =================================================================== >>>>> --- sys/vm/vm_reserv.c (revision 331399) >>>>> +++ sys/vm/vm_reserv.c (working copy) >>>>> @@ -45,8 +45,6 @@ >>>>> >>>>> #include >>>>> #include >>>>> -#include >>>>> -#include >>>>> #include >>>>> #include >>>>> #include >>>>> @@ -55,6 +53,8 @@ >>>>> #include >>>>> #include >>>>> #include >>>>> +#include >>>>> +#include >>>>> #include >>>>> #include >>>>> >>>>> This is because sys/i386/include/machine.h uses critical_enter() and >>>>> critical_exit() which are defined in sys/systm.h. >>> >>> Wrong fix. I see you committed this. Now there are more bugs to fix. >>> >>> is a prerequisite for all kernel headers except >>> , since it defines and declares things like KASSERT() and > ... > Can you please give this a once over? > > diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c > index d8869e3bdbe..6d31d79da39 100644 > --- a/sys/vm/vm_reserv.c > +++ b/sys/vm/vm_reserv.c > @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); > #include "opt_vm.h" > > #include > +#include > #include > #include > #include > @@ -52,7 +53,6 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#include > #include > #include > #include It is missing backing out the unsorting of counter.h and ktr.h. This should be fixed in the same commit, so that it only takes 3 instead of 4 commits to do the sorting. Reverting changes in historical order is too much for small patches, and doesn't work when the intermediate version is broken. Bruce