From: Alexey Dobriyan <adobriyan@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux@rasmusvillemoes.dk
Subject: [PATCH] static_assert: move before people start using it
Date: Sun, 10 Mar 2019 13:51:57 +0300 [thread overview]
Message-ID: <20190310105157.GA15039@avx2> (raw)
Userspace places static_assert() macro at <assert.h>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
include/assert.h | 19 +++++++++++++++++++
include/linux/build_bug.h | 19 -------------------
include/linux/fs.h | 2 +-
lib/vsprintf.c | 1 +
4 files changed, 21 insertions(+), 20 deletions(-)
new file mode 100644
--- /dev/null
+++ b/include/assert.h
@@ -0,0 +1,19 @@
+#pragma once
+/**
+ * static_assert - check integer constant expression at build time
+ *
+ * static_assert() is a wrapper for the C11 _Static_assert, with a
+ * little macro magic to make the message optional (defaulting to the
+ * stringification of the tested expression).
+ *
+ * Contrary to BUILD_BUG_ON(), static_assert() can be used at global
+ * scope, but requires the expression to be an integer constant
+ * expression (i.e., it is not enough that __builtin_constant_p() is
+ * true for expr).
+ *
+ * Also note that BUILD_BUG_ON() fails the build if the condition is
+ * true, while static_assert() fails the build if the expression is
+ * false.
+ */
+#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
+#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
--- a/include/linux/build_bug.h
+++ b/include/linux/build_bug.h
@@ -58,23 +58,4 @@
*/
#define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
-/**
- * static_assert - check integer constant expression at build time
- *
- * static_assert() is a wrapper for the C11 _Static_assert, with a
- * little macro magic to make the message optional (defaulting to the
- * stringification of the tested expression).
- *
- * Contrary to BUILD_BUG_ON(), static_assert() can be used at global
- * scope, but requires the expression to be an integer constant
- * expression (i.e., it is not enough that __builtin_constant_p() is
- * true for expr).
- *
- * Also note that BUILD_BUG_ON() fails the build if the condition is
- * true, while static_assert() fails the build if the expression is
- * false.
- */
-#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
-#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
-
#endif /* _LINUX_BUILD_BUG_H */
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _LINUX_FS_H
#define _LINUX_FS_H
-
+#include <assert.h>
#include <linux/linkage.h>
#include <linux/wait_bit.h>
#include <linux/kdev_t.h>
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -16,6 +16,7 @@
* - scnprintf and vscnprintf
*/
+#include <assert.h>
#include <stdarg.h>
#include <linux/build_bug.h>
#include <linux/clk.h>
next reply other threads:[~2019-03-10 10:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-10 10:51 Alexey Dobriyan [this message]
2019-03-10 21:19 ` [PATCH] static_assert: move before people start using it Rasmus Villemoes
2019-03-10 21:30 ` Alexey Dobriyan
2019-03-10 22:09 ` Rasmus Villemoes
2019-03-22 9:08 ` [static_assert] d94e96122a: bpf_jit_disasm.c: undefined reference to `assert' kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190310105157.GA15039@avx2 \
--to=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).