Skip to contentSkip to conversation

tools headers: Syncronize linux/build_bug.h with the kernel sources

PATCH Superseded Arnaldo Carvalho de Melo 2 participants 2 messages Mar 18

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools headers: Syncronize linux/build_bug.h with the kernel sources

tldr; Just FYI, I'm carrying this on the perf tools tree.

Full explanation:

There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model.

See further details at:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/include/uapi/README

To pick up the changes in:

6ffd853b0b10e1e2 ("build_bug.h: correct function parameters names in kernel-doc")

That just add some comments, addressing this perf tools build warning:

Warning: Kernel ABI header differences:
diff -u tools/include/linux/build_bug.h include/linux/build_bug.h

Please take a look at tools/include/uapi/README for further info on this synchronization process.

---
 include/linux/build_bug.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/build_bug.h +1 -3
index d3dc5dc5f916ff4e..2cfbb4c65c784ad8 100644
@@ -32,8 +32,7 @@
 /**
  * BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied
  *		      error message.
- * @cond: the condition which the compiler should know is false.
- * @msg: build-time error message
+ * @condition: the condition which the compiler should know is false.
  *
  * See BUILD_BUG_ON for description.
  */
@@ -61,7 +60,6 @@
 
 /**
  * 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
Signature · 1 line
2.53.0
#1 lore raw

nit: Typo in the subject line s/syncronize/synchronize/

include/linux/build_bug.h

Quoted 37 lines · Arnaldo Carvalho de Melo

tldr; Just FYI, I'm carrying this on the perf tools tree.

Full explanation:

There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model.

See further details at:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/include/uapi/README

To pick up the changes in:

6ffd853b0b10e1e2 ("build_bug.h: correct function parameters names in kernel-doc")

That just add some comments, addressing this perf tools build warning:

Warning: Kernel ABI header differences:
diff -u tools/include/linux/build_bug.h include/linux/build_bug.h

Please take a look at tools/include/uapi/README for further info on this synchronization process.

---
 include/linux/build_bug.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/build_bug.h +0 -0
index d3dc5dc5f916ff4e..2cfbb4c65c784ad8 100644

Shouldn't this patch be to the tools version?

Thanks,
Ian

Quoted 21 lines
include/linux/build_bug.h +1 -4
@@ -32,8 +32,7 @@
 /**
  * BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied
  *                   error message.
- * @cond: the condition which the compiler should know is false.
- * @msg: build-time error message
+ * @condition: the condition which the compiler should know is false.
  *
  * See BUILD_BUG_ON for description.
  */
@@ -61,7 +60,6 @@
 
 /**
  * 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
--

2.53.0