summaryrefslogtreecommitdiff
path: root/tools/include/linux
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2026-03-31 00:47:05 +0300
committerDave Airlie <airlied@redhat.com>2026-03-31 00:51:02 +0300
commitf6225b546dfccfc322b18c0d757b7b9c767a1e27 (patch)
tree14aee2a223e3f5e3e7850e6674d8367b4c835235 /tools/include/linux
parenta51973c5dff8a0f01cc7d1b2007306ea0004fa16 (diff)
parent7aaa8047eafd0bd628065b15757d9b48c5f9c07d (diff)
downloadlinux-f6225b546dfccfc322b18c0d757b7b9c767a1e27.tar.xz
BackMerge tag 'v7.0-rc6' into drm-next
Linux 7.0-rc6 Requested by a few people on irc to resolve conflicts in other tress. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/include/linux')
-rw-r--r--tools/include/linux/build_bug.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/include/linux/build_bug.h b/tools/include/linux/build_bug.h
index ab2aa97bd8ce..406923bd4846 100644
--- a/tools/include/linux/build_bug.h
+++ b/tools/include/linux/build_bug.h
@@ -32,7 +32,8 @@
/**
* BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied
* error message.
- * @condition: the condition which the compiler should know is false.
+ * @cond: the condition which the compiler should know is false.
+ * @msg: build-time error message
*
* See BUILD_BUG_ON for description.
*/
@@ -60,6 +61,7 @@
/**
* static_assert - check integer constant expression at build time
+ * @expr: expression to be checked
*
* static_assert() is a wrapper for the C11 _Static_assert, with a
* little macro magic to make the message optional (defaulting to the