svn commit: r255230 - head/sys/kern

[Pawel Jakub Dawidek]

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
> 
> Log:
>   Restore builds on architectures that don't support CAPABILITIES (mips).

Thanks for both fixes!

> Modified:
>   head/sys/kern/sys_generic.c
> 
> Modified: head/sys/kern/sys_generic.c
> ==============================================================================
> --- 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;
>  
>  	n = 0;
> @@ -1444,7 +1446,9 @@ pollscan(td, fds, nfd)
>  {
>  	struct filedesc *fdp = td->td_proc->p_fd;
>  	struct file *fp;
> +#ifdef CAPABILITIES
>  	cap_rights_t rights;
> +#endif
>  	int i, n = 0;
>  
>  	FILEDESC_SLOCK(fdp);

-- 
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://mobter.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20130905/28f69de9/attachment.sig>