From owner-svn-src-head@FreeBSD.ORG  Thu Sep  5 06:12:44 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D7EF1BDF;
 Thu,  5 Sep 2013 06:12:44 +0000 (UTC)
 (envelope-from pawel@dawidek.net)
Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72])
 by mx1.freebsd.org (Postfix) with ESMTP id 9D84B2D5B;
 Thu,  5 Sep 2013 06:12:44 +0000 (UTC)
Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149])
 by mail.dawidek.net (Postfix) with ESMTPSA id 90F6AEA4;
 Thu,  5 Sep 2013 08:07:15 +0200 (CEST)
Date: Thu, 5 Sep 2013 08:12:50 +0200
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Sean Bruno <sbruno@FreeBSD.org>
Subject: Re: svn commit: r255230 - head/sys/kern
Message-ID: <20130905061250.GC1388@garage.freebsd.pl>
References: <201309050346.r853kiXC088097@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="ABTtc+pdwF7KHXCz"
Content-Disposition: inline
In-Reply-To: <201309050346.r853kiXC088097@svn.freebsd.org>
X-OS: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Sep 2013 06:12:44 -0000


--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--