74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
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
|
|
@@ -1,7 +1,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
|