uapi: move constants from <linux/kernel.h> to <linux/const.h>
Subsystems (3)
PATCH 1/1 uapi: move constants from <linux/kernel.h> to <linux/const.h>
and include <linux/const.h> in UAPI headers instead of <linux/kernel.h>.
commit a85cbe6159ffc973e5702f70a3bd5185f8f3c38d upstream.
The reason is to avoid indirect <linux/sysinfo.h> include when using some network headers: <linux/netlink.h> or others -> <linux/kernel.h> -> <linux/sysinfo.h>.
This indirect include causes on MUSL redefinition of struct sysinfo when included both <sys/sysinfo.h> and some of UAPI headers:
In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5,
from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5,
from ../include/tst_netlink.h:14,
from tst_crypto.c:13:
x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo'
struct sysinfo {
^~~~~~~
In file included from ../include/tst_safe_macros.h:15,
from ../include/tst_test.h:93,
from tst_crypto.c:11:
x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here---
Hi,
could this fix be backported to stable releases?
Maybe safer to wait till v5.11 release.
Adjusted for stable/linux-4.9.y.
Kind regards,
Petr
include/uapi/linux/const.h | 5 +++++ include/uapi/linux/lightnvm.h | 2 +- include/uapi/linux/netfilter/x_tables.h | 2 +- include/uapi/linux/netlink.h | 2 +- include/uapi/linux/sysctl.h | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-)
include/uapi/linux/const.h +5 -0
@@ -24,4 +24,9 @@#define _BITUL (x) (_AC(1,UL) << (x))#define _BITULL (x) (_AC(1,ULL) << (x)) +#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL_MASK (x, mask) (((x) + (mask)) & ~(mask)) + +#define __KERNEL_DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d)) +#endif /* !(_LINUX_CONST_H) */
include/uapi/linux/lightnvm.h +1 -1
@@ -20,7 +20,7 @@#define _UAPI_LINUX_LIGHTNVM_H#ifdef __KERNEL__ -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/ioctl.h> #else /* __KERNEL__ */ #include <stdio.h>
include/uapi/linux/netfilter/x_tables.h +1 -1
@@ -1,6 +1,6 @@#ifndef _UAPI_X_TABLES_H#define _UAPI_X_TABLES_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #define XT_FUNCTION_MAXNAMELEN 30
include/uapi/linux/netlink.h +1 -1
@@ -1,7 +1,7 @@#ifndef _UAPI__LINUX_NETLINK_H#define _UAPI__LINUX_NETLINK_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/socket.h> /* for __kernel_sa_family_t */ #include <linux/types.h>
include/uapi/linux/sysctl.h +1 -1
@@ -22,7 +22,7 @@#ifndef _UAPI_LINUX_SYSCTL_H#define _UAPI_LINUX_SYSCTL_H -#include <linux/kernel.h> +#include <linux/const.h> #include <linux/types.h> #include <linux/compiler.h>
Signature · 1 line
2.29.2
Hi,
Quoted 32 lines
and include <
linux/const.h> in UAPI headers instead of <linux/kernel.h>.commit
a85cbe6159ffc973e5702f70a3bd5185f8f3c38dupstream.The reason is to avoid indirect <
linux/sysinfo.h> include when using some network headers: <linux/netlink.h> or others -> <linux/kernel.h> -> <linux/sysinfo.h>.This indirect include causes on MUSL redefinition of struct sysinfo when included both <
sys/sysinfo.h> and some of UAPI headers:In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, from ../include/tst_netlink.h:14, from tst_crypto.c:13: x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo' struct sysinfo { ^~~~~~~ In file included from ../include/tst_safe_macros.h:15, from ../include/tst_test.h:93, from tst_crypto.c:11: x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined hereSigned-off-by Petr Vorel <[email protected]>Suggested-by Rich Felker <[email protected]>Acked-by Rich Felker <[email protected]>Cc Peter Korsgaard <[email protected]>Cc Baruch Siach <[email protected]>Cc Florian Weimer <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>
Quoted 7 lines
---
Hi,could this fix be backported to stable releases?
Maybe safer to wait till v5.11 release.Adjusted for stable/linux-4.9.y.
I'm sorry, this one is for stable/linux-4.4.y
Kind regards,
Petr
Greg Kroah-Hartman
maintainerQuoted 37 lines · Petr Vorel
Hi,
Quoted 34 lines
and include <
linux/const.h> in UAPI headers instead of <linux/kernel.h>.commit
a85cbe6159ffc973e5702f70a3bd5185f8f3c38dupstream.The reason is to avoid indirect <
linux/sysinfo.h> include when using some network headers: <linux/netlink.h> or others -> <linux/kernel.h> -> <linux/sysinfo.h>.This indirect include causes on MUSL redefinition of struct sysinfo when included both <
sys/sysinfo.h> and some of UAPI headers:In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, from ../include/tst_netlink.h:14, from tst_crypto.c:13: x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo' struct sysinfo { ^~~~~~~ In file included from ../include/tst_safe_macros.h:15, from ../include/tst_test.h:93, from tst_crypto.c:11: x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined hereSigned-off-by Petr Vorel <[email protected]>Suggested-by Rich Felker <[email protected]>Acked-by Rich Felker <[email protected]>Cc Peter Korsgaard <[email protected]>Cc Baruch Siach <[email protected]>Cc Florian Weimer <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>---
Hi,
Quoted 5 lines
Quoted 4 lines
could this fix be backported to stable releases?
Maybe safer to wait till v5.11 release.Adjusted for stable/linux-4.9.y.
I'm sorry, this one is for stable/linux-4.4.y
No worries, queued up everywhere now, thanks!
greg k-h