Date: Sun, 8 Apr 2018 15:39:52 +1000 (EST) From: Bruce Evans <brde@optusnet.com.au> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Jeff Roberson <jroberson@jroberson.net>, Justin Hibbits <jrh29@alumni.cwru.edu>, Jeff Roberson <jeff@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r331369 - head/sys/vm Message-ID: <20180408153431.J1050@besplex.bde.org> In-Reply-To: <201804072223.w37MNBQI009248@slippy.cwsent.com> References: <201804072223.w37MNBQI009248@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <sys/param.h>
>>>>> #include <sys/kernel.h>
>>>>> -#include <sys/counter.h>
>>>>> -#include <sys/ktr.h>
>>>>> #include <sys/lock.h>
>>>>> #include <sys/malloc.h>
>>>>> #include <sys/mutex.h>
>>>>> @@ -55,6 +53,8 @@
>>>>> #include <sys/sbuf.h>
>>>>> #include <sys/sysctl.h>
>>>>> #include <sys/systm.h>
>>>>> +#include <sys/counter.h>
>>>>> +#include <sys/ktr.h>
>>>>> #include <sys/vmmeter.h>
>>>>> #include <sys/smp.h>
>>>>>
>>>>> 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.
>>>
>>> <sys/systm.h> is a prerequisite for all kernel headers except
>>> <sys/param.h>, 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 <sys/param.h>
> +#include <sys/systm.h>
> #include <sys/kernel.h>
> #include <sys/lock.h>
> #include <sys/malloc.h>
> @@ -52,7 +53,6 @@ __FBSDID("$FreeBSD$");
> #include <sys/rwlock.h>
> #include <sys/sbuf.h>
> #include <sys/sysctl.h>
> -#include <sys/systm.h>
> #include <sys/counter.h>
> #include <sys/ktr.h>
> #include <sys/vmmeter.h>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180408153431.J1050>