Date: Mon, 18 Dec 2006 21:54:29 +0100 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Norikatsu Shigemura <nork@FreeBSD.org> Cc: freebsd-fs@FreeBSD.org Subject: Re: ZFS cannot be compiled by changing sleepq_* Message-ID: <20061218205429.GB77687@garage.freebsd.pl> In-Reply-To: <20061218012229.11e8cb10.nork@FreeBSD.org> References: <20061218012229.11e8cb10.nork@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--NDin8bjvE/0mNLFQ Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 18, 2006 at 01:22:29AM +0900, Norikatsu Shigemura wrote: > Hi pjd! >=20 > In recently 7-current, by changing sleepq_* by kmacy, > I cannot compile ZFS. >=20 > cc -O2 -fno-strict-aliasing -pipe -march=3Dpentium3 -D_SOLARIS_C_SOURCE -= D_XOPEN_SOURCE=3D600 -D_XOPEN_SOURCE_EXTENDED=3D2 -D_XOPEN_VERSION=3D600 -D= _POSIX_C_SOURCE=3D200112L -D__BSD_VISIBLE=3D1 -D_STDC_C99 -DZFS_NO_ZONE -DZ= FS_MPSAFE -Werror -D_KERNEL -DKLD_MODULE -std=3Dc99 -nostdinc -I- -I/usr/s= rc/sys/modules/zfs/../../i386/include -I/usr/src/sys/modules/zfs/../../comp= at/opensolaris -I/usr/src/sys/modules/zfs/../../contrib/opensolaris/uts/com= mon/fs/zfs -I/usr/src/sys/modules/zfs/../../contrib/opensolaris/uts/common = -I/usr/src/sys/modules/zfs/../.. -I/usr/src/sys/modules/zfs/../../i386/incl= ude -I/usr/src/sys/modules/zfs/../../../contrib/opensolaris/common/zfs -I/u= sr/src/sys/modules/zfs/../../../contrib/opensolaris/common -I/usr/include -= I. -I@ -I@/contrib/altq -finline-limit=3D8000 --param inline-unit-growth=3D= 100 --param large-function-growth=3D1000 -fno-common -g -mno-align-long-str= ings -mpreferred-stack-boundary=3D2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2= -mno-sse3 -ffreestanding -Wall -Wno-u! > nknown-pragmas -Wno-missing-braces -Wno-sign-compare -Wno-parentheses -W= no-uninitialized -Wno-implicit-function-declaration -Wno-unused -Wno-trigra= phs -Wno-char-subscripts -Wno-switch -c /usr/src/sys/modules/zfs/../../comp= at/opensolaris/kern/opensolaris_condvar.c > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c: In function `cv_wait_unlock': > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c:128: error: too few arguments to function `sleepq_add' > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c: In function `cv_timedwait': > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c:165: error: too few arguments to function `sleepq_add' > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c: In function `cv_signal': > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c:189: error: too few arguments to function `sleepq_signal' > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c: In function `cv_broadcast': > /usr/src/sys/modules/zfs/../../compat/opensolaris/kern/opensolaris_condva= r.c:205: error: too few arguments to function `sleepq_broadcast' > *** Error code 1 >=20 > Stop in /usr/src/sys/modules/zfs. That's why there is a date in the patch name, so you can fetch FreeBSD source from exactly that date:) If you still want to compile it on recent HEAD, add '0' argument at the end of those functions calls: -sleepq_add(cvp, &mp->sx_object, cvp->cv_description, SLEEPQ_CONDVAR); +sleepq_add(cvp, &mp->sx_object, cvp->cv_description, SLEEPQ_CONDVAR, 0); -sleepq_add(cvp, &mp->sx_object, cvp->cv_description, SLEEPQ_CONDVAR); +sleepq_add(cvp, &mp->sx_object, cvp->cv_description, SLEEPQ_CONDVAR, 0); -sleepq_signal(cvp, SLEEPQ_CONDVAR, -1); +sleepq_signal(cvp, SLEEPQ_CONDVAR, -1, 0); -sleepq_broadcast(cvp, SLEEPQ_CONDVAR, -1); +sleepq_broadcast(cvp, SLEEPQ_CONDVAR, -1, 0); --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --NDin8bjvE/0mNLFQ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFFhwAFForvXbEpPzQRAtdwAJ9S/1Bhr4rsvfptJA6agQavusfiCQCgw5CJ ageEdF1emXMYHJYL0B5zcs0= =VUoc -----END PGP SIGNATURE----- --NDin8bjvE/0mNLFQ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061218205429.GB77687>