diff options
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch new file mode 100644 index 0000000000..6d9e8d864e --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 8e69b663d6ddef132041a1186f081fdd74d4a31d Mon Sep 17 00:00:00 2001 | ||
2 | From: rofl0r <retnyg@gmx.net> | ||
3 | Date: Mon, 20 Jan 2014 21:31:34 +0100 | ||
4 | Subject: [PATCH 3/3] remove inclusion of sysinfo.h in kernel.h | ||
5 | |||
6 | the declaration of struct sysinfo clashes with userspace. | ||
7 | it's not quite clear why that header was included from kernel.h, | ||
8 | as none of its functionality is needed. | ||
9 | --- | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | Upstream-Status: Submitted | ||
12 | |||
13 | include/uapi/linux/kernel.h | 2 ++ | ||
14 | 1 file changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h | ||
17 | index 321e399..e8ff821 100644 | ||
18 | --- a/include/uapi/linux/kernel.h | ||
19 | +++ b/include/uapi/linux/kernel.h | ||
20 | @@ -1,7 +1,9 @@ | ||
21 | #ifndef _UAPI_LINUX_KERNEL_H | ||
22 | #define _UAPI_LINUX_KERNEL_H | ||
23 | |||
24 | +#ifdef __GLIBC__ | ||
25 | #include <linux/sysinfo.h> | ||
26 | +#endif | ||
27 | |||
28 | /* | ||
29 | * 'kernel.h' contains some often-used function prototypes etc | ||
30 | -- | ||
31 | 2.6.4 | ||
32 | |||