uapi: wrap compiler_types.h in an ifdef instead of the implicit strip
Subsystems (3)
Jakub Kicinski
maintainerPATCH v2 1/1 uapi: wrap compiler_types.h in an ifdef instead of the implicit strip
The uAPI stddef header includes compiler_types.h, a kernel-only header, to make sure that kernel definitions of annotations like __counted_by() take precedence.
There is a hack in scripts/headers_install.sh which strips includes of compiler.h and compiler_types.h when installing uAPI headers. While explicit handling makes sense for compiler.h, which is included all over the uAPI, compiler_types.h is only included by stddef.h (within the uAPI, obviously it's included in kernel code a lot).
Remove the stripping from scripts/headers_install.sh and wrap the include of compiler_types.h in #ifdef __KERNEL__ instead. This should be equivalent functionally, but is easier to understand to a casual reader of the code. It also makes it easier to work with kernel headers directly from under tools/
---
v2:
- remove the hack from scripts/headers_install.sh
- wrap in __KERNEL__ instead of removing
v1: https://lore.kernel.org/[email protected]
--- scripts/headers_install.sh | 2 +- include/uapi/linux/stddef.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
scripts/headers_install.sh +1 -1
@@ -32,7 +32,7 @@ fi sed -E -e ' s/([[:space:](])(__user|__force|__iomem)[[:space:]]/\1/g s/__attribute_const__([[:space:]]|$)/\1/g - s@^#include <linux/compiler(|_types).h>@@ + s@^#include <linux/compiler.h>@@ s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @
include/uapi/linux/stddef.h +2 -0
@@ -2,7 +2,9 @@#ifndef _UAPI_LINUX_STDDEF_H#define _UAPI_LINUX_STDDEF_H +#ifdef __KERNEL__#include <linux/compiler_types.h> +#endif #ifndef __always_inline#define __always_inline inline
Signature · 1 line
2.51.0
Quoted 16 lines · Jakub Kicinski
The uAPI stddef header includes
compiler_types.h, a kernel-only header, to make sure that kernel definitions of annotations like__counted_by()take precedence.There is a hack in
scripts/headers_install.shwhich strips includes ofcompiler.handcompiler_types.hwhen installing uAPI headers. While explicit handling makes sense forcompiler.h, which is included all over the uAPI,compiler_types.his only included bystddef.h(within the uAPI, obviously it's included in kernel code a lot).Remove the stripping from
scripts/headers_install.shand wrap the include ofcompiler_types.hin #ifdef__KERNEL__instead. This should be equivalent functionally, but is easier to understand to a casual reader of the code. It also makes it easier to work with kernel headers directly from undertools/
Quoted 6 lines
Signed-off-by Jakub Kicinski <[email protected]>---
v2:
- remove the hack fromscripts/headers_install.sh
- wrap in__KERNEL__instead of removing
v1: https://lore.kernel.org/[email protected]
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 11 lines · On Mon, 25 Aug 2025 13:18:28 -0700 you wrote:
The uAPI stddef header includes
compiler_types.h, a kernel-only header, to make sure that kernel definitions of annotations like__counted_by()take precedence.There is a hack in
scripts/headers_install.shwhich strips includes ofcompiler.handcompiler_types.hwhen installing uAPI headers. While explicit handling makes sense forcompiler.h, which is included all over the uAPI,compiler_types.his only included bystddef.h(within the uAPI, obviously it's included in kernel code a lot).[...]
Here is the summary with links:
- [net-next,v2] uapi: wrap compiler_types.h in an ifdef instead of the implicit strip
https://git.kernel.org/netdev/net-next/c/c2a756891bb4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html