diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-06-03 12:59:55 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-20 22:11:33 +0100 |
| commit | 4336efe14b61e47177a2d0863f8391c48cf4a9f5 (patch) | |
| tree | 0135be3408bc34b45dba4bde3679e28bbfceee41 /target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch | |
| parent | e3c43ade0bae9491aeea50fa361e846bb5002dc0 (diff) | |
| download | upstream-4336efe14b61e47177a2d0863f8391c48cf4a9f5.tar.gz upstream-4336efe14b61e47177a2d0863f8391c48cf4a9f5.tar.bz2 upstream-4336efe14b61e47177a2d0863f8391c48cf4a9f5.zip | |
kernel: use upstream patches for musl
This replaces the current patches used to make the kernel headers
compatible with musl with the version which was accepted upstream. This
is included in upstream kernel 4.15.
This was compile tested with iproute2 build on all supported kernel
versions with musl and one one with glibc.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch b/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch deleted file mode 100644 index 9ec8daf886..0000000000 --- a/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: David Heidelberger <david.heidelberger@ixit.cz> -Subject: uapi/kernel.h: glibc specific inclusion of sysinfo.h - -including sysinfo.h from kernel.h makes no sense whatsoever, -but removing it breaks glibc's userspace header, -which includes kernel.h instead of sysinfo.h from their sys/sysinfo.h. -this seems to be a historical mistake. -on musl, including any header that uses kernel.h directly or indirectly -plus sys/sysinfo.h will produce a compile error due to redefinition of -struct sysinfo from sys/sysinfo.h. -so for now, only include it on glibc or when including from kernel -in order not to break their headers. - -Signed-off-by: John Spencer <maillist-linux@barfooze.de> -Signed-off-by: David Heidelberger <david.heidelberger@ixit.cz> -Signed-off-by: Jonas Gorski <jogo@openwrt.org> ---- - include/uapi/linux/kernel.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/include/uapi/linux/kernel.h -+++ b/include/uapi/linux/kernel.h -@@ -2,7 +2,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#if defined(__KERNEL__) || defined( __GLIBC__) - #include <linux/sysinfo.h> -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc |