linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Heidelberger <david.heidelberger@ixit.cz>
To: linux-kernel@vger.kernel.org
Cc: maillist-linux@barfooze.de, torvalds@linux-foundation.org
Subject: [PATCH 1/4] glibc specific inclusion of sysinfo.h in kernel.h
Date: Fri, 14 Mar 2014 17:14:10 +0100	[thread overview]
Message-ID: <130a9e0c237bae10e631a5ae52c5e2c8@ixit.cz> (raw)

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.h.
so for now, only include it on glibc 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>
---
  include/uapi/linux/kernel.h | 2 ++
  1 file changed, 2 insertion(+)

diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
index 321e399..8c45eeb 100644
--- 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

+#ifdef __GLIBC__
  #include <linux/sysinfo.h>
+#endif

  /*
   * 'kernel.h' contains some often-used function prototypes etc
   */
-- 
1.8.4

                 reply	other threads:[~2014-03-14 15:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=130a9e0c237bae10e631a5ae52c5e2c8@ixit.cz \
    --to=david.heidelberger@ixit.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maillist-linux@barfooze.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).