Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:10:41 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/asm: bug.h
Added Files:
src/sys/external/bsd/common/include/linux: build_bug.h
Removed Files:
src/sys/external/bsd/drm2/include/linux: build_bug.h
Log Message:
linux: Move BUILD_BUG_* to common linux/build_bug.h.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/common/include/asm/bug.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/include/linux/build_bug.h
cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/drm2/include/linux/build_bug.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/asm/bug.h
diff -u src/sys/external/bsd/common/include/asm/bug.h:1.2 src/sys/external/bsd/common/include/asm/bug.h:1.3
--- src/sys/external/bsd/common/include/asm/bug.h:1.2 Sun Dec 19 11:01:37 2021
+++ src/sys/external/bsd/common/include/asm/bug.h Sun Dec 19 11:10:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bug.h,v 1.2 2021/12/19 11:01:37 riastradh Exp $ */
+/* $NetBSD: bug.h,v 1.3 2021/12/19 11:10:41 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,22 +35,11 @@
#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)))
+#include <linux/build_bug.h> /* XXX */
#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((long)(EXPR)))
-
/* XXX Rate limit? */
#define WARN(CONDITION, FMT, ...) \
linux_warning((CONDITION)? \
Added files:
Index: src/sys/external/bsd/common/include/linux/build_bug.h
diff -u /dev/null src/sys/external/bsd/common/include/linux/build_bug.h:1.1
--- /dev/null Sun Dec 19 11:10:41 2021
+++ src/sys/external/bsd/common/include/linux/build_bug.h Sun Dec 19 11:10:41 2021
@@ -0,0 +1,47 @@
+/* $NetBSD: build_bug.h,v 1.1 2021/12/19 11:10:41 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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_BUILD_BUG_H_
+#define _LINUX_BUILD_BUG_H_
+
+#include <lib/libkern/libkern.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 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((long)(EXPR)))
+
+#endif /* _LINUX_BUILD_BUG_H_ */
