Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Sep 2013 08:12:50 +0200
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        Sean Bruno <sbruno@FreeBSD.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org
Subject:   Re: svn commit: r255230 - head/sys/kern
Message-ID:  <20130905061250.GC1388@garage.freebsd.pl>
In-Reply-To: <201309050346.r853kiXC088097@svn.freebsd.org>
References:  <201309050346.r853kiXC088097@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--ABTtc+pdwF7KHXCz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Sep 05, 2013 at 03:46:44AM +0000, Sean Bruno wrote:
> Author: sbruno
> Date: Thu Sep  5 03:46:44 2013
> New Revision: 255230
> URL: http://svnweb.freebsd.org/changeset/base/255230
>=20
> Log:
>   Restore builds on architectures that don't support CAPABILITIES (mips).

Thanks for both fixes!

> Modified:
>   head/sys/kern/sys_generic.c
>=20
> Modified: head/sys/kern/sys_generic.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/kern/sys_generic.c	Thu Sep  5 03:36:57 2013	(r255229)
> +++ head/sys/kern/sys_generic.c	Thu Sep  5 03:46:44 2013	(r255230)
> @@ -1368,7 +1368,9 @@ pollrescan(struct thread *td)
>  	struct filedesc *fdp;
>  	struct file *fp;
>  	struct pollfd *fd;
> +#ifdef CAPABILITIES
>  	cap_rights_t rights;
> +#endif
>  	int n;
> =20
>  	n =3D 0;
> @@ -1444,7 +1446,9 @@ pollscan(td, fds, nfd)
>  {
>  	struct filedesc *fdp =3D td->td_proc->p_fd;
>  	struct file *fp;
> +#ifdef CAPABILITIES
>  	cap_rights_t rights;
> +#endif
>  	int i, n =3D 0;
> =20
>  	FILEDESC_SLOCK(fdp);

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://mobter.com

--ABTtc+pdwF7KHXCz
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iEYEARECAAYFAlIoIOIACgkQForvXbEpPzTCIwCfXYcZ+mUECmsmZHeSimcgBc46
j9cAn02sw7eqn8wy+fn3F+EI9vmL1wKu
=hUHn
-----END PGP SIGNATURE-----

--ABTtc+pdwF7KHXCz--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130905061250.GC1388>