Date: Sat, 14 Apr 2018 14:14:36 +0200 From: Magnus Ringman <bmr@ringman.ch> To: David Wolfskill <david@catwhisker.org>, Magnus Ringman <bmr@ringman.ch>, Brooks Davis <brooks@freebsd.org>, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, freebsd-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r332493 - stable/11/sys/net Message-ID: <CA%2BYF35m0DHt6naG=VmvZ1eHL4KArf6ooqT1U9UNybtRBoax1rg@mail.gmail.com> In-Reply-To: <20180414113743.GR63353@albert.catwhisker.org> References: <201804132232.w3DMWSmI019256@repo.freebsd.org> <CA%2BYF35n5uvph1msJJKW5OfwBUZLnAmC12g7dvbgs480KbEtyMg@mail.gmail.com> <20180414113743.GR63353@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
I don't think anyone has committed a fix yet (I'm not eligible, just lurking here.) Just manually integrate the missing change. At the top of your src tree: patch -p1 << __EOT --- head/sys/sys/ioccom.h 2017/11/20 19:43:44 326023 +++ head/sys/sys/ioccom.h 2018/03/16 22:23:04 331077 @@ -61,6 +61,10 @@ #define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t)) /* this should be _IORW, but stdio got there first */ #define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t)) +/* Replace length/type in an ioctl command. */ +#define _IOC_NEWLEN(ioc, len) \ + (((~(IOCPARM_MASK << 16)) & (ioc)) | (((len) & IOCPARM_MASK) << 16)) +#define _IOC_NEWTYPE(ioc, type) _IOC_NEWLEN((ioc), sizeof(type)) #ifdef _KERNEL __EOT On Sat, Apr 14, 2018 at 1:37 PM, David Wolfskill <david@catwhisker.org> wro= te: > On Sat, Apr 14, 2018 at 01:31:28PM +0200, Magnus Ringman wrote: >> Hi Brooks, this MFC missed your r331077 >> (https://reviews.freebsd.org/D14706) thus stable buildkernel currently >> breaks on missing those two macros. >> >> (_IOC_NEWLEN and _IOC_NEWTYPE for searchability) >> >> Sk=C3=A5l, >> Magnus >> .... > > Aye; looks as if that would explain the kernel build failures I had this > morning in stable/11, trying to update from r332465 -> r332496. > > Peace, > david > -- > David H. Wolfskill david@catwhisker.org > Donald Trump's criticism of others comes across as psychological projecti= on. > > See http://www.catwhisker.org/~david/publickey.gpg for my public key.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2BYF35m0DHt6naG=VmvZ1eHL4KArf6ooqT1U9UNybtRBoax1rg>