diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-23 12:27:52 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-23 12:28:41 +0000 |
commit | a8e5cce0855c6d429659637fb552c5b22023e517 (patch) | |
tree | 848d2caf50fe29c886baf89bf551d1164c724b57 /main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | |
parent | 66ff4f8a6b71dd204bc568c21c45941d612402c2 (diff) | |
download | aports-a8e5cce0855c6d429659637fb552c5b22023e517.tar.bz2 aports-a8e5cce0855c6d429659637fb552c5b22023e517.tar.xz |
main/linux-headers: add fix for sysinfo.h back
patch was sent upstream but was never included by upstream.
Diffstat (limited to 'main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch')
-rw-r--r-- | main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch new file mode 100644 index 0000000000..b5c4e1750e --- /dev/null +++ b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch @@ -0,0 +1,29 @@ +From 8e69b663d6ddef132041a1186f081fdd74d4a31d Mon Sep 17 00:00:00 2001 +From: rofl0r <retnyg@gmx.net> +Date: Mon, 20 Jan 2014 21:31:34 +0100 +Subject: [PATCH 3/3] remove inclusion of sysinfo.h in kernel.h + +the declaration of struct sysinfo clashes with userspace. +it's not quite clear why that header was included from kernel.h, +as none of its functionality is needed. +--- +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Submitted + + include/uapi/linux/kernel.h | 2 ++ + 1 file changed, 2 insertions(+) + +Index: linux-4.8-rc4/include/uapi/linux/kernel.h +=================================================================== +--- linux-4.8-rc4.orig/include/uapi/linux/kernel.h ++++ linux-4.8-rc4/include/uapi/linux/kernel.h +@@ -1,7 +1,9 @@ + #ifndef _UAPI_LINUX_KERNEL_H + #define _UAPI_LINUX_KERNEL_H + ++#ifdef __GLIBC__ + #include <linux/sysinfo.h> ++#endif + + /* + * 'kernel.h' contains some often-used function prototypes etc |