[Midnightbsd-cvs] src [9905] trunk/sys/sys: sync with freebsd 10-stable
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 24 18:46:03 EDT 2018
Revision: 9905
http://svnweb.midnightbsd.org/src/?rev=9905
Author: laffer1
Date: 2018-05-24 18:46:02 -0400 (Thu, 24 May 2018)
Log Message:
-----------
sync with freebsd 10-stable
Modified Paths:
--------------
trunk/sys/sys/turnstile.h
trunk/sys/sys/types.h
trunk/sys/sys/uio.h
trunk/sys/sys/unistd.h
Modified: trunk/sys/sys/turnstile.h
===================================================================
--- trunk/sys/sys/turnstile.h 2018-05-24 22:45:13 UTC (rev 9904)
+++ trunk/sys/sys/turnstile.h 2018-05-24 22:46:02 UTC (rev 9905)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 John Baldwin <jhb at FreeBSD.org>
* All rights reserved.
@@ -10,9 +11,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of any co-contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -26,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/sys/turnstile.h 262192 2014-02-18 20:27:17Z jhb $
*/
#ifndef _SYS_TURNSTILE_H_
Modified: trunk/sys/sys/types.h
===================================================================
--- trunk/sys/sys/types.h 2018-05-24 22:45:13 UTC (rev 9904)
+++ trunk/sys/sys/types.h 2018-05-24 22:46:02 UTC (rev 9905)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -32,7 +33,7 @@
* SUCH DAMAGE.
*
* @(#)types.h 8.6 (Berkeley) 2/19/95
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/sys/types.h 289107 2015-10-10 05:50:42Z kib $
*/
#ifndef _SYS_TYPES_H_
@@ -72,8 +73,7 @@
typedef quad_t * qaddr_t;
typedef char * caddr_t; /* core address */
-typedef __const char * c_caddr_t; /* core address, pointer to const */
-typedef __volatile char *v_caddr_t; /* core address, pointer to volatile */
+typedef const char * c_caddr_t; /* core address, pointer to const */
#ifndef _BLKSIZE_T_DECLARED
typedef __blksize_t blksize_t;
@@ -89,8 +89,6 @@
#define _BLKCNT_T_DECLARED
#endif
-typedef __cap_rights_t cap_rights_t;
-
#ifndef _CLOCK_T_DECLARED
typedef __clock_t clock_t;
#define _CLOCK_T_DECLARED
@@ -189,6 +187,8 @@
#define _RLIM_T_DECLARED
#endif
+typedef __int64_t sbintime_t;
+
typedef __segsz_t segsz_t; /* segment size (in pages) */
#ifndef _SIZE_T_DECLARED
@@ -233,6 +233,13 @@
#define _USECONDS_T_DECLARED
#endif
+#ifndef _CAP_RIGHTS_T_DECLARED
+#define _CAP_RIGHTS_T_DECLARED
+struct cap_rights;
+
+typedef struct cap_rights cap_rights_t;
+#endif
+
typedef __vm_offset_t vm_offset_t;
typedef __vm_ooffset_t vm_ooffset_t;
typedef __vm_paddr_t vm_paddr_t;
@@ -279,10 +286,7 @@
* The following are all things that really shouldn't exist in this header,
* since its purpose is to provide typedefs, not miscellaneous doodads.
*/
-#if __BSD_VISIBLE
-#include <sys/select.h>
-
#ifdef __POPCNT__
#define __bitcount64(x) __builtin_popcountll((__uint64_t)(x))
#define __bitcount32(x) __builtin_popcount((__uint32_t)(x))
@@ -345,6 +349,10 @@
#define __bitcount(x) __bitcount32((unsigned int)(x))
#endif
+#if __BSD_VISIBLE
+
+#include <sys/select.h>
+
/*
* minor() gives a cookie instead of an index since we don't want to
* change the meanings of bits 0-15 or waste time and space shifting
Modified: trunk/sys/sys/uio.h
===================================================================
--- trunk/sys/sys/uio.h 2018-05-24 22:45:13 UTC (rev 9904)
+++ trunk/sys/sys/uio.h 2018-05-24 22:46:02 UTC (rev 9905)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1982, 1986, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* @(#)uio.h 8.5 (Berkeley) 2/22/94
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/sys/uio.h 292348 2015-12-16 19:01:14Z ken $
*/
#ifndef _SYS_UIO_H_
@@ -85,23 +86,30 @@
struct vm_object;
struct vm_page;
+struct bus_dma_segment;
struct uio *cloneuio(struct uio *uiop);
int copyinfrom(const void * __restrict src, void * __restrict dst,
size_t len, int seg);
-int copyiniov(struct iovec *iovp, u_int iovcnt, struct iovec **iov,
+int copyiniov(const struct iovec *iovp, u_int iovcnt, struct iovec **iov,
int error);
int copyinstrfrom(const void * __restrict src, void * __restrict dst,
size_t len, size_t * __restrict copied, int seg);
-int copyinuio(struct iovec *iovp, u_int iovcnt, struct uio **uiop);
+int copyinuio(const struct iovec *iovp, u_int iovcnt, struct uio **uiop);
int copyout_map(struct thread *td, vm_offset_t *addr, size_t sz);
int copyout_unmap(struct thread *td, vm_offset_t addr, size_t sz);
+int physcopyin(void *src, vm_paddr_t dst, size_t len);
+int physcopyout(vm_paddr_t src, void *dst, size_t len);
+int physcopyin_vlist(struct bus_dma_segment *src, off_t offset,
+ vm_paddr_t dst, size_t len);
+int physcopyout_vlist(vm_paddr_t src, struct bus_dma_segment *dst,
+ off_t offset, size_t len);
int uiomove(void *cp, int n, struct uio *uio);
int uiomove_frombuf(void *buf, int buflen, struct uio *uio);
int uiomove_fromphys(struct vm_page *ma[], vm_offset_t offset, int n,
struct uio *uio);
int uiomove_nofault(void *cp, int n, struct uio *uio);
-int uiomoveco(void *cp, int n, struct uio *uio, int disposable);
+int uiomove_object(struct vm_object *obj, off_t obj_size, struct uio *uio);
#else /* !_KERNEL */
Modified: trunk/sys/sys/unistd.h
===================================================================
--- trunk/sys/sys/unistd.h 2018-05-24 22:45:13 UTC (rev 9904)
+++ trunk/sys/sys/unistd.h 2018-05-24 22:46:02 UTC (rev 9905)
@@ -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.
*
* @(#)unistd.h 8.2 (Berkeley) 1/7/94
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/sys/unistd.h 312171 2017-01-14 11:27:11Z kib $
*/
#ifndef _SYS_UNISTD_H_
@@ -53,7 +54,7 @@
#define _POSIX_ASYNCHRONOUS_IO 0
#define _POSIX_CHOWN_RESTRICTED 1
#define _POSIX_CLOCK_SELECTION (-1)
-#define _POSIX_CPUTIME (-1)
+#define _POSIX_CPUTIME 200112L
#define _POSIX_FSYNC 200112L
#define _POSIX_IPV6 0
#define _POSIX_JOB_CONTROL 1
@@ -65,7 +66,7 @@
#define _POSIX_MONOTONIC_CLOCK 200112L
#define _POSIX_NO_TRUNC 1
#define _POSIX_PRIORITIZED_IO (-1)
-#define _POSIX_PRIORITY_SCHEDULING 200112L
+#define _POSIX_PRIORITY_SCHEDULING 0
#define _POSIX_RAW_SOCKETS 200112L
#define _POSIX_REALTIME_SIGNALS 200112L
#define _POSIX_SEMAPHORES 200112L
More information about the Midnightbsd-cvs
mailing list