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/
Showing the changes to include/uapi (1 of 2 files). Show all
Unified · Split
| @@ -2,7 +2,9 @@ · 1 unmodified line | |||
| 2 | #ifndef _UAPI_LINUX_STDDEF_H | 2 | #ifndef _UAPI_LINUX_STDDEF_H |
| 3 | #define _UAPI_LINUX_STDDEF_H | 3 | #define _UAPI_LINUX_STDDEF_H |
| 4 | 4 | ||
| 5 | #ifdef __KERNEL__ | ||
| 5 | #include <linux/compiler_types.h> | 6 | #include <linux/compiler_types.h> |
| 7 | #endif | ||
| 6 | 8 | ||
| 7 | #ifndef __always_inline | 9 | #ifndef __always_inline |
| 8 | #define __always_inline inline | 10 | #define __always_inline inline |