Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 10:55:16 UTC 2021

Added Files:
        src/sys/external/bsd/common/include/asm: bug.h
        src/sys/external/bsd/common/include/linux: bug.h
Removed Files:
        src/sys/external/bsd/drm2/include/asm: bug.h
        src/sys/external/bsd/drm2/include/linux: bug.h

Log Message:
Move linux/bug.h and asm/bug.h to common.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/include/asm/bug.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/include/linux/bug.h
cvs rdiff -u -r1.7 -r0 src/sys/external/bsd/drm2/include/asm/bug.h
cvs rdiff -u -r1.3 -r0 src/sys/external/bsd/drm2/include/linux/bug.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/external/bsd/common/include/asm/bug.h
diff -u /dev/null src/sys/external/bsd/common/include/asm/bug.h:1.1
--- /dev/null	Sun Dec 19 10:55:16 2021
+++ src/sys/external/bsd/common/include/asm/bug.h	Sun Dec 19 10:55:15 2021
@@ -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_ */

Index: src/sys/external/bsd/common/include/linux/bug.h
diff -u /dev/null src/sys/external/bsd/common/include/linux/bug.h:1.1
--- /dev/null	Sun Dec 19 10:55:16 2021
+++ src/sys/external/bsd/common/include/linux/bug.h	Sun Dec 19 10:55:15 2021
@@ -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_ */

Reply via email to