Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd Move linux/bug.h and asm/bug.h to common.
details: https://anonhg.NetBSD.org/src/rev/039c66f3828d
branches: trunk
changeset: 1028388:039c66f3828d
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sun Dec 19 10:55:15 2021 +0000
description:
Move linux/bug.h and asm/bug.h to common.
diffstat:
sys/external/bsd/common/include/asm/bug.h | 75 +++++++++++++++++++++++++++++
sys/external/bsd/common/include/linux/bug.h | 40 +++++++++++++++
sys/external/bsd/drm2/include/asm/bug.h | 75 -----------------------------
sys/external/bsd/drm2/include/linux/bug.h | 40 ---------------
4 files changed, 115 insertions(+), 115 deletions(-)
diffs (246 lines):
diff -r 4fdf95317982 -r 039c66f3828d sys/external/bsd/common/include/asm/bug.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/common/include/asm/bug.h Sun Dec 19 10:55:15 2021 +0000
@@ -0,0 +1,75 @@
+/* $NetBSD: bug.h,v 1.1 2021/12/19 10:55:15 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 _ASM_BUG_H_
+#define _ASM_BUG_H_
+
+#include <sys/cdefs.h>
+#include <sys/systm.h>
+
+/*
+ * static_assert is violated with runtime-only compiler semantics in a few
+ * places. Instead of breaking the build, stop asserting these corner cases.
+ */
+
+#define DRMCTASSERT(x) CTASSERT((__builtin_choose_expr( \
+ __builtin_constant_p(x), (x), 1)))
+
+#define BUG() panic("%s:%d: BUG!", __FILE__, __LINE__)
+#define BUG_ON(CONDITION) KASSERT(!(CONDITION))
+
+#define BUILD_BUG() do {} while (0)
+#define BUILD_BUG_ON(CONDITION) DRMCTASSERT(!(CONDITION))
+#define BUILD_BUG_ON_MSG(CONDITION,MSG) DRMCTASSERT(!(CONDITION))
+#define BUILD_BUG_ON_INVALID(EXPR) ((void)sizeof(EXPR))
+
+/* XXX Rate limit? */
+#define WARN(CONDITION, FMT, ...) \
+ linux_warning((CONDITION)? \
+ (printf("warning: %s:%d: " FMT, __FILE__, __LINE__, \
+ ##__VA_ARGS__), 1) \
+ : 0)
+
+#define WARN_ONCE(CONDITION, FMT, ...) \
+ WARN(CONDITION, FMT, ##__VA_ARGS__) /* XXX */
+
+#define WARN_ON(CONDITION) WARN(CONDITION, "%s\n", #CONDITION)
+#define WARN_ON_SMP(CONDITION) WARN_ON(CONDITION) /* XXX */
+#define WARN_ON_ONCE(CONDITION) WARN_ON(CONDITION) /* XXX */
+
+/* XXX Kludge to avoid GCC warning about statements without effect. */
+static inline int
+linux_warning(int x)
+{
+ return x;
+}
+
+#endif /* _ASM_BUG_H_ */
diff -r 4fdf95317982 -r 039c66f3828d sys/external/bsd/common/include/linux/bug.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/common/include/linux/bug.h Sun Dec 19 10:55:15 2021 +0000
@@ -0,0 +1,40 @@
+/* $NetBSD: bug.h,v 1.1 2021/12/19 10:55:15 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_BUG_H_
+#define _LINUX_BUG_H_
+
+#include <asm/bug.h>
+
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \
+ CTASSERT(((n) != 0) && (((n) & ((n) - 1)) == 0))
+
+#endif /* _LINUX_BUG_H_ */
diff -r 4fdf95317982 -r 039c66f3828d sys/external/bsd/drm2/include/asm/bug.h
--- a/sys/external/bsd/drm2/include/asm/bug.h Sun Dec 19 10:52:23 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/* $NetBSD: bug.h,v 1.7 2021/12/19 00:46:36 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 _ASM_BUG_H_
-#define _ASM_BUG_H_
-
-#include <sys/cdefs.h>
-#include <sys/systm.h>
-
-/*
- * static_assert is violated with runtime-only compiler semantics in a few
- * places. Instead of breaking the build, stop asserting these corner cases.
- */
-
-#define DRMCTASSERT(x) CTASSERT((__builtin_choose_expr( \
- __builtin_constant_p(x), (x), 1)))
-
-#define BUG() panic("%s:%d: BUG!", __FILE__, __LINE__)
-#define BUG_ON(CONDITION) KASSERT(!(CONDITION))
-
-#define BUILD_BUG() do {} while (0)
-#define BUILD_BUG_ON(CONDITION) DRMCTASSERT(!(CONDITION))
-#define BUILD_BUG_ON_MSG(CONDITION,MSG) DRMCTASSERT(!(CONDITION))
-#define BUILD_BUG_ON_INVALID(EXPR) ((void)sizeof(EXPR))
-
-/* XXX Rate limit? */
-#define WARN(CONDITION, FMT, ...) \
- linux_warning((CONDITION)? \
- (printf("warning: %s:%d: " FMT, __FILE__, __LINE__, \
- ##__VA_ARGS__), 1) \
- : 0)
-
-#define WARN_ONCE(CONDITION, FMT, ...) \
- WARN(CONDITION, FMT, ##__VA_ARGS__) /* XXX */
-
-#define WARN_ON(CONDITION) WARN(CONDITION, "%s\n", #CONDITION)
-#define WARN_ON_SMP(CONDITION) WARN_ON(CONDITION) /* XXX */
-#define WARN_ON_ONCE(CONDITION) WARN_ON(CONDITION) /* XXX */
-
-/* XXX Kludge to avoid GCC warning about statements without effect. */
-static inline int
-linux_warning(int x)
-{
- return x;
-}
-
-#endif /* _ASM_BUG_H_ */
diff -r 4fdf95317982 -r 039c66f3828d sys/external/bsd/drm2/include/linux/bug.h
--- a/sys/external/bsd/drm2/include/linux/bug.h Sun Dec 19 10:52:23 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/* $NetBSD: bug.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_BUG_H_
-#define _LINUX_BUG_H_
-
-#include <asm/bug.h>
-
-#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \
- CTASSERT(((n) != 0) && (((n) & ((n) - 1)) == 0))
-
-#endif /* _LINUX_BUG_H_ */
Home |
Main Index |
Thread Index |
Old Index