diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 07:58:33 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 07:58:33 +0200 |
| commit | ff1c0c5d07028a84837950b619d30da623f8ddb2 (patch) | |
| tree | 0dac4e0728613580a935876b3b5ba7ba29f51865 /tools/include/linux | |
| parent | 09c04714cb455debc1dcc3535b6becb52c5b01e0 (diff) | |
| parent | d6e152d905bdb1f32f9d99775e2f453350399a6a (diff) | |
Merge branch 'timers/urgent' into timers/core
to resolve the conflict with urgent fixes.
Diffstat (limited to 'tools/include/linux')
| -rw-r--r-- | tools/include/linux/build_bug.h | 4 |
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 |