[src/trunk]: src/sys/external/bsd Move linux/err.h into common/include.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3a38631c14a5
branches:  trunk
changeset: 810117:3a38631c14a5
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Aug 18 21:10:56 2015 +0000

description:
Move linux/err.h into common/include.

OK riastradh@

diffstat:

 sys/external/bsd/common/include/linux/err.h |  87 +++++++++++++++++++++++++++++
 sys/external/bsd/drm2/include/linux/err.h   |  87 -----------------------------
 2 files changed, 87 insertions(+), 87 deletions(-)

diffs (182 lines):

diff -r 4b5bea3fd6f9 -r 3a38631c14a5 sys/external/bsd/common/include/linux/err.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/common/include/linux/err.h       Tue Aug 18 21:10:56 2015 +0000
@@ -0,0 +1,87 @@
+/*     $NetBSD: err.h,v 1.1 2015/08/18 21:10:56 skrll Exp $    */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_ERR_H_
+#define _LINUX_ERR_H_
+
+/* XXX Linux uses long and int inconsistently here.  Hope this works out.  */
+
+#include <sys/types.h>
+#include <sys/errno.h>
+#include <sys/systm.h>
+
+#define        MAX_ERRNO       ELAST
+
+static inline bool
+IS_ERR_VALUE(uintptr_t n)
+{
+       return (n >= (uintptr_t)-MAX_ERRNO);
+}
+
+static inline void *
+ERR_PTR(long error)
+{
+       KASSERT(error < 0);
+       return (void *)(intptr_t)error;
+}
+
+static inline long
+PTR_ERR(const void *ptr)
+{
+       KASSERT(ptr == (void *)(intptr_t)(long)(intptr_t)ptr); /* XXX Hurk!  */
+       return (long)(intptr_t)ptr;
+}
+
+static inline bool
+IS_ERR(const void *ptr)
+{
+       return IS_ERR_VALUE((uintptr_t)ptr);
+}
+
+static inline bool
+IS_ERR_OR_NULL(const void *ptr)
+{
+       return ((ptr == NULL) || IS_ERR(ptr));
+}
+
+static inline void *
+ERR_CAST(void *ptr)            /* XXX Linux declares with const.  */
+{
+       return ptr;
+}
+
+static inline long
+PTR_RET(const void *ptr)
+{
+       return (IS_ERR(ptr)? PTR_ERR(ptr) : 0);
+}
+
+#endif  /* _LINUX_ERR_H_ */
diff -r 4b5bea3fd6f9 -r 3a38631c14a5 sys/external/bsd/drm2/include/linux/err.h
--- a/sys/external/bsd/drm2/include/linux/err.h Tue Aug 18 19:40:21 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*     $NetBSD: err.h,v 1.3 2014/07/16 20:56:25 riastradh Exp $        */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Taylor R. Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _LINUX_ERR_H_
-#define _LINUX_ERR_H_
-
-/* XXX Linux uses long and int inconsistently here.  Hope this works out.  */
-
-#include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/systm.h>
-
-#define        MAX_ERRNO       ELAST
-
-static inline bool
-IS_ERR_VALUE(uintptr_t n)
-{
-       return (n >= (uintptr_t)-MAX_ERRNO);
-}
-
-static inline void *
-ERR_PTR(long error)
-{
-       KASSERT(error < 0);
-       return (void *)(intptr_t)error;
-}
-
-static inline long
-PTR_ERR(const void *ptr)
-{
-       KASSERT(ptr == (void *)(intptr_t)(long)(intptr_t)ptr); /* XXX Hurk!  */
-       return (long)(intptr_t)ptr;
-}
-
-static inline bool
-IS_ERR(const void *ptr)
-{
-       return IS_ERR_VALUE((uintptr_t)ptr);
-}
-
-static inline bool
-IS_ERR_OR_NULL(const void *ptr)
-{
-       return ((ptr == NULL) || IS_ERR(ptr));
-}
-
-static inline void *
-ERR_CAST(void *ptr)            /* XXX Linux declares with const.  */
-{
-       return ptr;
-}
-
-static inline long
-PTR_RET(const void *ptr)
-{
-       return (IS_ERR(ptr)? PTR_ERR(ptr) : 0);
-}
-
-#endif  /* _LINUX_ERR_H_ */