[Midnightbsd-cvs] src [9906] trunk/sys/sys: sync with freebsd 10-stable

[laffer1 at midnightbsd.org]

Revision: 9906
          http://svnweb.midnightbsd.org/src/?rev=9906
Author:   laffer1
Date:     2018-05-24 22:44:46 -0400 (Thu, 24 May 2018)
Log Message:
-----------
sync with freebsd 10-stable

Modified Paths:
--------------
    trunk/sys/sys/ucontext.h
    trunk/sys/sys/ucred.h

Modified: trunk/sys/sys/ucontext.h
===================================================================
--- trunk/sys/sys/ucontext.h	2018-05-24 22:46:02 UTC (rev 9905)
+++ trunk/sys/sys/ucontext.h	2018-05-25 02:44:46 UTC (rev 9906)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.
@@ -25,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/sys/ucontext.h 278347 2015-02-07 08:47:15Z kib $
  */
 
 #ifndef _SYS_UCONTEXT_H_
@@ -99,7 +100,7 @@
 
 /* Machine-dependent functions: */
 int	get_mcontext(struct thread *, mcontext_t *, int);
-int	set_mcontext(struct thread *, const mcontext_t *);
+int	set_mcontext(struct thread *, mcontext_t *);
 
 #endif /* !_KERNEL */
 

Modified: trunk/sys/sys/ucred.h
===================================================================
--- trunk/sys/sys/ucred.h	2018-05-24 22:46:02 UTC (rev 9905)
+++ trunk/sys/sys/ucred.h	2018-05-25 02:44:46 UTC (rev 9906)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/sys/ucred.h 303846 2016-08-08 18:31:28Z bdrewery $
  */
 
 #ifndef _SYS_UCRED_H_
@@ -106,6 +107,8 @@
 struct ucred	*crdup(struct ucred *cr);
 void	crextend(struct ucred *cr, int n);
 void	cred_update_thread(struct thread *td);
+void	proc_set_cred_init(struct proc *p, struct ucred *cr);
+struct ucred	*proc_set_cred(struct proc *p, struct ucred *cr);
 void	crfree(struct ucred *cr);
 struct ucred	*crget(void);
 struct ucred	*crhold(struct ucred *cr);