30 lines
887 B
Diff
30 lines
887 B
Diff
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(+)
|
|
|
|
diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
|
|
index fadf2db71fe8..813800ed141f 100644
|
|
--- 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
|
|
|
|
+#ifdef __GLIBC__
|
|
#include <linux/sysinfo.h>
|
|
+#endif
|
|
#include <linux/const.h>
|
|
|
|
#endif /* _UAPI_LINUX_KERNEL_H */
|