Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 376c3111 authored by Petr Vorel's avatar Petr Vorel Committed by Greg Kroah-Hartman
Browse files

uapi: move constants from <linux/kernel.h> to <linux/const.h> 

commit a85cbe6159ffc973e5702f70a3bd5185f8f3c38d upstream.

and include <linux/const.h> in UAPI headers instead of <linux/kernel.h>.

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

Link: https://lkml.kernel.org/r/20201015190013.8901-1-petr.vorel@gmail.com


Signed-off-by: default avatarPetr Vorel <petr.vorel@gmail.com>
Suggested-by: default avatarRich Felker <dalias@aerifal.cx>
Acked-by: default avatarRich Felker <dalias@libc.org>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Florian Weimer <fweimer@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af07e4dd

include/uapi/linux/const.h

+5 −0
Original line number Diff line number Diff line
@@ -28,4 +28,9 @@ 
#define _BITUL(x)	(_UL(1) << (x))

#define _BITULL(x)	(_ULL(1) << (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 /* _UAPI_LINUX_CONST_H */

include/uapi/linux/ethtool.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifndef _UAPI_LINUX_ETHTOOL_H

#define _UAPI_LINUX_ETHTOOL_H



#include <linux/kernel.h>

#include <linux/const.h>

#include <linux/types.h>

#include <linux/if_ether.h>

include/uapi/linux/kernel.h

+1 −8
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ 
#define _UAPI_LINUX_KERNEL_H



#include <linux/sysinfo.h>



/*

 * 'kernel.h' contains some often-used function prototypes etc

 */

#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))

#include <linux/const.h>



#endif /* _UAPI_LINUX_KERNEL_H */

include/uapi/linux/lightnvm.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,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/mroute6.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef _UAPI__LINUX_MROUTE6_H

#define _UAPI__LINUX_MROUTE6_H



#include <linux/kernel.h>

#include <linux/const.h>

#include <linux/types.h>

#include <linux/sockios.h>

#include <linux/in6.h>		/* For struct sockaddr_in6. */