[gentoo-commits] gentoo commit in src/patchsets/gentoo-headers/2.6.28: 0001-x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch 0002-linux-timex.h-cleanup-for-userspace.patch 0003-linux-elf.h-remove-kernel-prototypes-for-userspace.patch 0004-linux-uio.h-cleanup-for-userspace.patch 0005-headers_check.pl-disallow-extern-s.patch 0006-headers_install.pl-autoconvert-asm-inline-volatile.patch 0007-linux-serial.h-pull-in-linux-types.h-for-userspace.patch 0008-kbuild-check-for-leaked-CONFIG_-symbols-to-userspac.patch 0009-kbuild-warn-about-headers-using-__-us-8-16-32-64.patch 0010-kbuild-auto-convert-size-types-in-userspace-headers.patch 0011-linux-types.h-export-aligned_-u-be-le-64-macros.patch 0012-linux-stat-socket-.h-remove-__GLIBC__-checks.patch 0013-linux-pull-in-other-needed-headers-for-userspace.patch 0014-HACK-asm-pull-in-C-library-headers.patch 0015-HACK-linux-pull-in-C-library-headers.patch 00_all_headers_install.pl-autoconvert-asm-inline-volatile.patch 00_a ll_kbuild-auto-co nvert-size-types-in-userspace-headers.patch 00_all_linux-elf.h-remove-kernel-prototypes-for-userspace.patch 00_all_linux-serial.h-pull-in-linux-types.h-for-userspace.patch 00_all_linux-timex.h-cleanup-for-userspace.patch 00_all_linux-uio.h-cleanup-for-userspace.patch 00_all_x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch 03_all_linux-export-aligned-64bits.patch 05_all_no-glibc-ifdefs.patch 07_all_pull-libc-headers-asm.patch 07_all_pull-libc-headers-linux.patch 09_all_include-other-linux-headers.patch

[Mike Frysinger (vapier)]

vapier      08/12/29 13:00:17

  Added:               
                        0001-x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch
                        0002-linux-timex.h-cleanup-for-userspace.patch
                        0003-linux-elf.h-remove-kernel-prototypes-for-userspace.patch
                        0004-linux-uio.h-cleanup-for-userspace.patch
                        0005-headers_check.pl-disallow-extern-s.patch
                        0006-headers_install.pl-autoconvert-asm-inline-volatile.patch
                        0007-linux-serial.h-pull-in-linux-types.h-for-userspace.patch
                        0008-kbuild-check-for-leaked-CONFIG_-symbols-to-userspac.patch
                        0009-kbuild-warn-about-headers-using-__-us-8-16-32-64.patch
                        0010-kbuild-auto-convert-size-types-in-userspace-headers.patch
                        0011-linux-types.h-export-aligned_-u-be-le-64-macros.patch
                        0012-linux-stat-socket-.h-remove-__GLIBC__-checks.patch
                        0013-linux-pull-in-other-needed-headers-for-userspace.patch
                        0014-HACK-asm-pull-in-C-library-headers.patch
                        0015-HACK-linux-pull-in-C-library-headers.patch
  Removed:             
                        00_all_headers_install.pl-autoconvert-asm-inline-volatile.patch
                        00_all_kbuild-auto-convert-size-types-in-userspace-headers.patch
                        00_all_linux-elf.h-remove-kernel-prototypes-for-userspace.patch
                        00_all_linux-serial.h-pull-in-linux-types.h-for-userspace.patch
                        00_all_linux-timex.h-cleanup-for-userspace.patch
                        00_all_linux-uio.h-cleanup-for-userspace.patch
                        00_all_x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch
                        03_all_linux-export-aligned-64bits.patch
                        05_all_no-glibc-ifdefs.patch
                        07_all_pull-libc-headers-asm.patch
                        07_all_pull-libc-headers-linux.patch
                        09_all_include-other-linux-headers.patch
  Log:
  switch to git-style patches

Revision  Changes    Path
1.1                  src/patchsets/gentoo-headers/2.6.28/0001-x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0001-x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0001-x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch?rev=1.1&content-type=text/plain

Index: 0001-x86-setup.h-hide-kernel-stuff-behind-__KERNEL__-for.patch
===================================================================
From e1609036c1d145b3e60bfc6ce68168f9cabeaff5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Sat, 27 Dec 2008 00:58:20 -0500
Subject: [PATCH] x86/setup.h: hide kernel stuff behind __KERNEL__ for userspace

The x86 setup.h bleeds a bunch of kernel functions/structs to userspace, so
move them behind __KERNEL__.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 arch/x86/include/asm/setup.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index f12d372..e4c80fe 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -3,6 +3,8 @@
 
 #define COMMAND_LINE_SIZE 2048
 
+#ifdef __KERNEL__
+
 #ifndef __ASSEMBLY__
 
 /* Interrupt control for vSMPowered x86_64 systems */
@@ -49,8 +51,6 @@ extern unsigned long saved_video_mode;
 #endif
 #endif /* __ASSEMBLY__ */
 
-#ifdef __KERNEL__
-
 #ifdef __i386__
 
 #include <linux/pfn.h>
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0002-linux-timex.h-cleanup-for-userspace.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0002-linux-timex.h-cleanup-for-userspace.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0002-linux-timex.h-cleanup-for-userspace.patch?rev=1.1&content-type=text/plain

Index: 0002-linux-timex.h-cleanup-for-userspace.patch
===================================================================
From 6454cdad97da7776c0dcedf8c926382a778c52b5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Sun, 26 Oct 2008 06:31:48 -0400
Subject: [PATCH] linux/timex.h: cleanup for userspace

Move all the kernel-specific defines and includes into the __KERNEL__
section so that they don't get leaked into userspace.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/linux/timex.h |   73 +++++++++++++++++++++++++------------------------
 1 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 9007313..4bbbab5 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -53,47 +53,11 @@
 #ifndef _LINUX_TIMEX_H
 #define _LINUX_TIMEX_H
 
-#include <linux/compiler.h>
 #include <linux/time.h>
 
-#include <asm/param.h>
-
 #define NTP_API		4	/* NTP API version */
 
 /*
- * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
- * for a slightly underdamped convergence characteristic. SHIFT_KH
- * establishes the damping of the FLL and is chosen by wisdom and black
- * art.
- *
- * MAXTC establishes the maximum time constant of the PLL. With the
- * SHIFT_KG and SHIFT_KF values given and a time constant range from
- * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
- * respectively.
- */
-#define SHIFT_PLL	4	/* PLL frequency factor (shift) */
-#define SHIFT_FLL	2	/* FLL frequency factor (shift) */
-#define MAXTC		10	/* maximum time constant (shift) */
-
-/*
- * SHIFT_USEC defines the scaling (shift) of the time_freq and
- * time_tolerance variables, which represent the current frequency
- * offset and maximum frequency tolerance.
- */
-#define SHIFT_USEC 16		/* frequency offset scale (shift) */
-#define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
-#define PPM_SCALE_INV_SHIFT 19
-#define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
-		       PPM_SCALE + 1)
-
-#define MAXPHASE 500000000l	/* max phase error (ns) */
-#define MAXFREQ 500000		/* max frequency error (ns/s) */
-#define MAXFREQ_SCALED ((s64)MAXFREQ << NTP_SCALE_SHIFT)
-#define MINSEC 256		/* min interval between updates (s) */
-#define MAXSEC 2048		/* max interval between updates (s) */
-#define NTP_PHASE_LIMIT ((MAXPHASE / NSEC_PER_USEC) << 5) /* beyond max. dispersion */
-
-/*
  * syscall interface - used (mainly by NTP daemon)
  * to discipline kernel clock oscillator
  */
@@ -199,9 +163,46 @@ struct timex {
 #define TIME_BAD	TIME_ERROR /* bw compat */
 
 #ifdef __KERNEL__
+#include <linux/compiler.h>
+#include <linux/types.h>
+
+#include <asm/param.h>
 #include <asm/timex.h>
 
 /*
+ * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
+ * for a slightly underdamped convergence characteristic. SHIFT_KH
+ * establishes the damping of the FLL and is chosen by wisdom and black
+ * art.
+ *
+ * MAXTC establishes the maximum time constant of the PLL. With the
+ * SHIFT_KG and SHIFT_KF values given and a time constant range from
+ * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
+ * respectively.
+ */
+#define SHIFT_PLL	4	/* PLL frequency factor (shift) */
+#define SHIFT_FLL	2	/* FLL frequency factor (shift) */
+#define MAXTC		10	/* maximum time constant (shift) */
+
+/*
+ * SHIFT_USEC defines the scaling (shift) of the time_freq and
+ * time_tolerance variables, which represent the current frequency
+ * offset and maximum frequency tolerance.
+ */
+#define SHIFT_USEC 16		/* frequency offset scale (shift) */
+#define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
+#define PPM_SCALE_INV_SHIFT 19
+#define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
+		       PPM_SCALE + 1)
+
+#define MAXPHASE 500000000l	/* max phase error (ns) */
+#define MAXFREQ 500000		/* max frequency error (ns/s) */
+#define MAXFREQ_SCALED ((s64)MAXFREQ << NTP_SCALE_SHIFT)
+#define MINSEC 256		/* min interval between updates (s) */
+#define MAXSEC 2048		/* max interval between updates (s) */
+#define NTP_PHASE_LIMIT ((MAXPHASE / NSEC_PER_USEC) << 5) /* beyond max. dispersion */
+
+/*
  * kernel variables
  * Note: maximum error = NTP synch distance = dispersion + delay / 2;
  * estimated error = NTP dispersion.
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0003-linux-elf.h-remove-kernel-prototypes-for-userspace.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0003-linux-elf.h-remove-kernel-prototypes-for-userspace.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0003-linux-elf.h-remove-kernel-prototypes-for-userspace.patch?rev=1.1&content-type=text/plain

Index: 0003-linux-elf.h-remove-kernel-prototypes-for-userspace.patch
===================================================================
From 428c23f88c0ec9bd75945705ecc0c59501b07766 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Sat, 27 Dec 2008 01:05:27 -0500
Subject: [PATCH] linux/elf.h: remove kernel prototypes for userspace

The internal elf notes funcs do are for the kernel-only, so hide them
behind __KERNEL__.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/linux/elf.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/elf.h b/include/linux/elf.h
index 0b61ca4..1b6e350 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -395,6 +395,7 @@ extern Elf64_Dyn _DYNAMIC [];
 
 #endif
 
+#ifdef __KERNEL__
 /* Optional callbacks to write extra ELF notes. */
 #ifndef ARCH_HAVE_EXTRA_ELF_NOTES
 static inline int elf_coredump_extra_notes_size(void) { return 0; }
@@ -404,5 +405,6 @@ static inline int elf_coredump_extra_notes_write(struct file *file,
 extern int elf_coredump_extra_notes_size(void);
 extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset);
 #endif
+#endif
 
 #endif /* _LINUX_ELF_H */
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0004-linux-uio.h-cleanup-for-userspace.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0004-linux-uio.h-cleanup-for-userspace.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0004-linux-uio.h-cleanup-for-userspace.patch?rev=1.1&content-type=text/plain

Index: 0004-linux-uio.h-cleanup-for-userspace.patch
===================================================================
From dda9c6313a67d097283afde7b6b608b3c0920302 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Sat, 27 Dec 2008 01:11:46 -0500
Subject: [PATCH v3] linux/uio.h: cleanup for userspace

Hide iov_shorten() behind __KERNEL__ since it's a prototype only.  Use the
__inline__ form for iov_length() since it's usable by userspace.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
v3
	- keep all __KERNEL__ stuff in one place
v2
	- drop inline conversion stuff

 include/linux/uio.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/uio.h b/include/linux/uio.h
index b7fe138..3debd89 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -26,6 +26,8 @@ struct kvec {
 	size_t iov_len;
 };
 
+unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+
 #endif
 
 /*
@@ -52,6 +54,4 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 	return ret;
 }
 
-unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
-
 #endif
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0005-headers_check.pl-disallow-extern-s.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0005-headers_check.pl-disallow-extern-s.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0005-headers_check.pl-disallow-extern-s.patch?rev=1.1&content-type=text/plain

Index: 0005-headers_check.pl-disallow-extern-s.patch
===================================================================
From d75f69d9b5b6cf2db802842acdcca57a80a3685d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Sat, 27 Dec 2008 02:37:43 -0500
Subject: [PATCH] headers_check.pl: disallow extern's

Since prototypes with "extern" refer to kernel functions, they make no
sense in userspace, so reject them automatically.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 scripts/headers_check.pl |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index 488a3b1..5bdd975 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -14,7 +14,9 @@
 #    Only include files located in asm* and linux* are checked.
 #    The rest are assumed to be system include files.
 #
-# 2) TODO: check for leaked CONFIG_ symbols
+# 2) It is checked that prototypes does not use "extern"
+#
+# 3) TODO: check for leaked CONFIG_ symbols
 
 use strict;
 
@@ -33,6 +35,7 @@ foreach my $file (@files) {
 	while ($line = <FH>) {
 		$lineno++;
 		check_include();
+		check_prototypes();
 	}
 	close FH;
 }
@@ -54,3 +57,10 @@ sub check_include
 		}
 	}
 }
+
+sub check_prototypes
+{
+	if ($line =~ m/^\s*extern\b/) {
+		printf STDERR "$filename:$lineno: extern's make no sense in userspace\n";
+	}
+}
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0006-headers_install.pl-autoconvert-asm-inline-volatile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0006-headers_install.pl-autoconvert-asm-inline-volatile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0006-headers_install.pl-autoconvert-asm-inline-volatile.patch?rev=1.1&content-type=text/plain

Index: 0006-headers_install.pl-autoconvert-asm-inline-volatile.patch
===================================================================
From dd2868d21c8b1cdfe7819d49607696a0569d6aa5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Sat, 27 Dec 2008 02:51:32 -0500
Subject: [PATCH] headers_install.pl: autoconvert asm/inline/volatile to __xxx__

Headers in userspace should be using the __xxx__ form of the asm, inline,
and volatile keywords.  Since people like to revert these things without
realizing what's going on, have the headers install step autoconvert these
keywords.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 scripts/headers_install.pl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index 7d2b414..c6ae405 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -36,6 +36,9 @@ foreach my $file (@files) {
 		$line =~ s/\s__attribute_const__\s/ /g;
 		$line =~ s/\s__attribute_const__$//g;
 		$line =~ s/^#include <linux\/compiler.h>//;
+		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
+		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
+		$line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
 		printf OUTFILE "%s", $line;
 	}
 	close OUTFILE;
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0007-linux-serial.h-pull-in-linux-types.h-for-userspace.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0007-linux-serial.h-pull-in-linux-types.h-for-userspace.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0007-linux-serial.h-pull-in-linux-types.h-for-userspace.patch?rev=1.1&content-type=text/plain

Index: 0007-linux-serial.h-pull-in-linux-types.h-for-userspace.patch
===================================================================
From 04f79d4a95d3656bd7bf45281947eeee46bdf73c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 04:27:02 -0500
Subject: [PATCH] linux/serial.h: pull in linux/types.h for userspace

Since the struct serial_rs485 is exported to userspace and uses __u##,
types we need to include linux/types.h for it.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/linux/serial.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/serial.h b/include/linux/serial.h
index 1ea8d92..fa72b39 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -10,8 +10,8 @@
 #ifndef _LINUX_SERIAL_H
 #define _LINUX_SERIAL_H
 
-#ifdef __KERNEL__
 #include <linux/types.h>
+#ifdef __KERNEL__
 #include <asm/page.h>
 
 /*
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0008-kbuild-check-for-leaked-CONFIG_-symbols-to-userspac.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0008-kbuild-check-for-leaked-CONFIG_-symbols-to-userspac.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0008-kbuild-check-for-leaked-CONFIG_-symbols-to-userspac.patch?rev=1.1&content-type=text/plain

Index: 0008-kbuild-check-for-leaked-CONFIG_-symbols-to-userspac.patch
===================================================================
From 036aac737511413f1ae48342b69564b0ef5aec0c Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@××××××××.org>
Date: Sat, 27 Dec 2008 19:54:15 +0100
Subject: [PATCH] kbuild: check for leaked CONFIG_ symbols to userspace

Signed-off-by: Sam Ravnborg <sam@××××××××.org>
---
 scripts/headers_check.pl |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index 5bdd975..bdd9fb6 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -16,7 +16,7 @@
 #
 # 2) It is checked that prototypes does not use "extern"
 #
-# 3) TODO: check for leaked CONFIG_ symbols
+# 3) Check for leaked CONFIG_ symbols
 
 use strict;
 
@@ -36,6 +36,7 @@ foreach my $file (@files) {
 		$lineno++;
 		check_include();
 		check_prototypes();
+		check_config();
 	}
 	close FH;
 }
@@ -64,3 +65,10 @@ sub check_prototypes
 		printf STDERR "$filename:$lineno: extern's make no sense in userspace\n";
 	}
 }
+
+sub check_config
+{
+	if ($line =~ m/[^a-zA-Z0-9_]+CONFIG_([a-zA-Z0-9]+)[^a-zA-Z0-9]/) {
+		printf STDERR "$filename:$lineno: leaks CONFIG_$1 to userspace where it is not valid\n";
+	}
+}
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0009-kbuild-warn-about-headers-using-__-us-8-16-32-64.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0009-kbuild-warn-about-headers-using-__-us-8-16-32-64.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0009-kbuild-warn-about-headers-using-__-us-8-16-32-64.patch?rev=1.1&content-type=text/plain

Index: 0009-kbuild-warn-about-headers-using-__-us-8-16-32-64.patch
===================================================================
From 58ffae8a95e580e08be2d8f302fd9fcfca78a3f3 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 05:28:24 -0500
Subject: [PATCH] kbuild: warn about headers using __[us]{8,16,32,64} types w/out linux/types.h

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 scripts/headers_check.pl |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index bdd9fb6..5036319 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -37,6 +37,7 @@ foreach my $file (@files) {
 		check_include();
 		check_prototypes();
 		check_config();
+		check_sizetypes();
 	}
 	close FH;
 }
@@ -72,3 +73,22 @@ sub check_config
 		printf STDERR "$filename:$lineno: leaks CONFIG_$1 to userspace where it is not valid\n";
 	}
 }
+
+my $linux_types;
+sub check_sizetypes
+{
+	if ($lineno == 1) {
+		$linux_types = 0;
+	} elsif ($linux_types) {
+		return;
+	}
+	if ($line =~ m/^\s*#\s*include\s+<linux\/types.h>/) {
+		$linux_types = 1;
+		return;
+	}
+	if ($line =~ m/__[us](8|16|32|64)\b/) {
+		printf STDERR "$filename:$lineno: found __[us]{8,16,32,64} type w/out #include <linux/types.h>\n";
+		# Warn until headers are all fixed
+		#$ret = 1;
+	}
+}
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0010-kbuild-auto-convert-size-types-in-userspace-headers.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0010-kbuild-auto-convert-size-types-in-userspace-headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0010-kbuild-auto-convert-size-types-in-userspace-headers.patch?rev=1.1&content-type=text/plain

Index: 0010-kbuild-auto-convert-size-types-in-userspace-headers.patch
===================================================================
From f2bf6639442caebb1810b3644b08a7d5236a0837 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 06:07:47 -0500
Subject: [PATCH] kbuild: auto-convert size types in userspace headers

Rather than constantly fixing up size type breakage in userspace headers,
auto convert the types u_intXX_t, uintXX_t, intXX_t, uXX, and sXX to the
appropriate __uXX or __sXX type.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 scripts/headers_install.pl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index c6ae405..697f02d 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -39,6 +39,9 @@ foreach my $file (@files) {
 		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
 		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
 		$line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
+		$line =~ s/\b([us](8|16|32|64))\b/__$1/g;
+		$line =~ s/\b(u_?int(8|16|32|64)_t)\b/__u$2/g;
+		$line =~ s/\b(int(8|16|32|64)_t)\b/__s$2/g;
 		printf OUTFILE "%s", $line;
 	}
 	close OUTFILE;
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0011-linux-types.h-export-aligned_-u-be-le-64-macros.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0011-linux-types.h-export-aligned_-u-be-le-64-macros.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0011-linux-types.h-export-aligned_-u-be-le-64-macros.patch?rev=1.1&content-type=text/plain

Index: 0011-linux-types.h-export-aligned_-u-be-le-64-macros.patch
===================================================================
From 050a1d788a183addd15e5b1e8f0c992588ffc3e5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 06:51:45 -0500
Subject: [PATCH] linux/types.h: export aligned_{u,be,le}64 macros

Some userspace headers rely on these aligned_* macros and they don't
conflict with normal userspace / libc types, so always export them
regardless of the define __KERNEL_STRICT_NAMES.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/linux/types.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/types.h b/include/linux/types.h
index 1d98330..a999d0c 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -125,11 +125,6 @@ typedef		__u64		u_int64_t;
 typedef		__s64		int64_t;
 #endif
 
-/* this is a special 64bit data type that is 8-byte aligned */
-#define aligned_u64 __u64 __attribute__((aligned(8)))
-#define aligned_be64 __be64 __attribute__((aligned(8)))
-#define aligned_le64 __le64 __attribute__((aligned(8)))
-
 /**
  * The type used for indexing onto a disc or disc partition.
  *
@@ -161,6 +156,11 @@ typedef unsigned long blkcnt_t;
 
 #endif /* __KERNEL_STRICT_NAMES */
 
+/* this is a special 64bit data type that is 8-byte aligned */
+#define aligned_u64 __u64 __attribute__((aligned(8)))
+#define aligned_be64 __be64 __attribute__((aligned(8)))
+#define aligned_le64 __le64 __attribute__((aligned(8)))
+
 /*
  * Below are truly Linux-specific types that should never collide with
  * any application/library that wants linux/types.h.
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0012-linux-stat-socket-.h-remove-__GLIBC__-checks.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0012-linux-stat-socket-.h-remove-__GLIBC__-checks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0012-linux-stat-socket-.h-remove-__GLIBC__-checks.patch?rev=1.1&content-type=text/plain

Index: 0012-linux-stat-socket-.h-remove-__GLIBC__-checks.patch
===================================================================
From d6f760ef3e59257d404b0d0b3c5879a14a95352c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 06:52:59 -0500
Subject: [PATCH] linux/{stat,socket}.h: remove __GLIBC__ checks

Only check __KERNEL__ so we don't assume the C library is glibc.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/linux/socket.h |    2 +-
 include/linux/stat.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 20fc4bb..d9b4492 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage {
 				/* _SS_MAXSIZE value minus size of ss_family */
 } __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#ifdef __KERNEL__
 
 #include <asm/socket.h>			/* arch-dependent defines	*/
 #include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 611c398..5460344 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -7,7 +7,7 @@
 
 #endif
 
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
+#ifdef __KERNEL__
 
 #define S_IFMT  00170000
 #define S_IFSOCK 0140000
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0013-linux-pull-in-other-needed-headers-for-userspace.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0013-linux-pull-in-other-needed-headers-for-userspace.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0013-linux-pull-in-other-needed-headers-for-userspace.patch?rev=1.1&content-type=text/plain

Index: 0013-linux-pull-in-other-needed-headers-for-userspace.patch
===================================================================
From 4746067f2c53a4e84a8003d03c6943302bb11c98 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 07:41:01 -0500
Subject: [PATCH] linux/*: pull in other needed headers for userspace

mondo patch

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/linux/atalk.h              |    1 +
 include/linux/atm_zatm.h           |    1 +
 include/linux/auto_fs.h            |    2 +-
 include/linux/auto_fs4.h           |    2 ++
 include/linux/bfs_fs.h             |    2 ++
 include/linux/cm4000_cs.h          |    3 +++
 include/linux/dn.h                 |    3 +++
 include/linux/efs_fs_sb.h          |    1 +
 include/linux/elfcore.h            |    1 -
 include/linux/errqueue.h           |    2 ++
 include/linux/ext2_fs.h            |    1 +
 include/linux/gfs2_ondisk.h        |    2 ++
 include/linux/hdlc/ioctl.h         |    1 +
 include/linux/hiddev.h             |    2 ++
 include/linux/if_fc.h              |    1 +
 include/linux/if_ppp.h             |    3 +++
 include/linux/if_pppol2tp.h        |    5 +----
 include/linux/if_strip.h           |    2 ++
 include/linux/if_tunnel.h          |    2 ++
 include/linux/inet_diag.h          |    2 ++
 include/linux/ipv6_route.h         |    2 ++
 include/linux/ipx.h                |    1 +
 include/linux/irda.h               |    3 +++
 include/linux/isdn_divertif.h      |    1 +
 include/linux/llc.h                |    4 ++++
 include/linux/minix_fs.h           |    1 +
 include/linux/netfilter/x_tables.h |    2 ++
 include/linux/netrom.h             |    2 ++
 include/linux/nfs_idmap.h          |    2 ++
 include/linux/nfsd/syscall.h       |    6 ++----
 include/linux/nubus.h              |    2 ++
 include/linux/pkt_cls.h            |    1 +
 include/linux/pkt_sched.h          |    2 ++
 include/linux/ppp_defs.h           |    2 ++
 include/linux/random.h             |    1 +
 include/linux/romfs_fs.h           |    2 ++
 include/linux/rose.h               |    3 +++
 include/linux/scc.h                |    1 +
 include/linux/selinux_netlink.h    |    2 ++
 include/linux/synclink.h           |    3 +++
 include/linux/times.h              |    1 +
 include/linux/un.h                 |    2 ++
 include/linux/video_decoder.h      |    2 ++
 include/linux/video_encoder.h      |    2 ++
 include/linux/x25.h                |    1 +
 45 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index e9ebac2..ba61b9f 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -2,6 +2,7 @@
 #define __LINUX_ATALK_H__
 
 #include <asm/byteorder.h>
+#include <linux/socket.h>
 
 /*
  * AppleTalk networking structures
diff --git a/include/linux/atm_zatm.h b/include/linux/atm_zatm.h
index 10f0fa2..ca03fef 100644
--- a/include/linux/atm_zatm.h
+++ b/include/linux/atm_zatm.h
@@ -12,6 +12,7 @@
  * sys/types.h for struct timeval
  */
 
+#include <linux/time.h>
 #include <linux/atmapi.h>
 #include <linux/atmioc.h>
 
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h
index c21e597..9a5c539 100644
--- a/include/linux/auto_fs.h
+++ b/include/linux/auto_fs.h
@@ -16,10 +16,10 @@
 
 #ifdef __KERNEL__
 #include <linux/fs.h>
-#include <linux/limits.h>
 #include <asm/types.h>
 #endif /* __KERNEL__ */
 
+#include <linux/limits.h>
 #include <linux/ioctl.h>
 
 /* This file describes autofs v3 */
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h
index 2253716..9c46e4c 100644
--- a/include/linux/auto_fs4.h
+++ b/include/linux/auto_fs4.h
@@ -11,6 +11,8 @@
 #ifndef _LINUX_AUTO_FS4_H
 #define _LINUX_AUTO_FS4_H
 
+#include <linux/types.h>
+
 /* Include common v3 definitions */
 #include <linux/auto_fs.h>
 
diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h
index 8ed6dfd..2ca3e8f 100644
--- a/include/linux/bfs_fs.h
+++ b/include/linux/bfs_fs.h
@@ -6,6 +6,8 @@
 #ifndef _LINUX_BFS_FS_H
 #define _LINUX_BFS_FS_H
 
+#include <linux/types.h>
+
 #define BFS_BSIZE_BITS		9
 #define BFS_BSIZE		(1<<BFS_BSIZE_BITS)
 
diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
index 605ebe2..8d95b2f 100644
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
@@ -1,6 +1,9 @@
 #ifndef	_CM4000_H_
 #define	_CM4000_H_
 
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
 #define	MAX_ATR			33
 
 #define	CM4000_MAX_DEV		4
diff --git a/include/linux/dn.h b/include/linux/dn.h
index 02bba04..5b5c587 100644
--- a/include/linux/dn.h
+++ b/include/linux/dn.h
@@ -7,6 +7,9 @@
 
 */
 
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
 /* 
  * DNPROTO_NSP can't be the same as SOL_SOCKET, 
  * so increment each by one (compared to ULTRIX)
diff --git a/include/linux/efs_fs_sb.h b/include/linux/efs_fs_sb.h
index ff1945e..a742b29 100644
--- a/include/linux/efs_fs_sb.h
+++ b/include/linux/efs_fs_sb.h
@@ -10,6 +10,7 @@
 #define __EFS_FS_SB_H__
 
 #include <linux/magic.h>
+#include <linux/types.h>
 
 /* EFS superblock magic numbers */
 #define EFS_MAGIC	0x072959
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index 5ca54d7..1e9cfca 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -24,7 +24,6 @@ struct elf_siginfo
 typedef elf_greg_t greg_t;
 typedef elf_gregset_t gregset_t;
 typedef elf_fpregset_t fpregset_t;
-typedef elf_fpxregset_t fpxregset_t;
 #define NGREG ELF_NGREG
 #endif
 
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index 92f8d4f..ceb1454 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_ERRQUEUE_H
 #define _LINUX_ERRQUEUE_H 1
 
+#include <linux/types.h>
+
 struct sock_extended_err
 {
 	__u32	ee_errno;	
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 78c775a..8d5aaa2 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -18,6 +18,7 @@
 
 #include <linux/types.h>
 #include <linux/magic.h>
+#include <linux/fs.h>
 
 /*
  * The second extended filesystem constants/structures
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 14d0df0..c56b4bc 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -10,6 +10,8 @@
 #ifndef __GFS2_ONDISK_DOT_H__
 #define __GFS2_ONDISK_DOT_H__
 
+#include <linux/types.h>
+
 #define GFS2_MAGIC		0x01161970
 #define GFS2_BASIC_BLOCK	512
 #define GFS2_BASIC_BLOCK_SHIFT	9
diff --git a/include/linux/hdlc/ioctl.h b/include/linux/hdlc/ioctl.h
index 5839723..79c4ef8 100644
--- a/include/linux/hdlc/ioctl.h
+++ b/include/linux/hdlc/ioctl.h
@@ -1,6 +1,7 @@
 #ifndef __HDLC_IOCTL_H__
 #define __HDLC_IOCTL_H__
 
+#include <linux/if.h>
 
 #define GENERIC_HDLC_VERSION 4	/* For synchronization with sethdlc utility */
 
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h
index c760ae0..bb6f58b 100644
--- a/include/linux/hiddev.h
+++ b/include/linux/hiddev.h
@@ -27,6 +27,8 @@
  * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
  */
 
+#include <linux/types.h>
+
 /*
  * The event structure itself
  */
diff --git a/include/linux/if_fc.h b/include/linux/if_fc.h
index 376a34e..6ed7f1b 100644
--- a/include/linux/if_fc.h
+++ b/include/linux/if_fc.h
@@ -20,6 +20,7 @@
 #ifndef _LINUX_IF_FC_H
 #define _LINUX_IF_FC_H
 
+#include <linux/types.h>
 
 #define FC_ALEN	6		/* Octets in one ethernet addr	 */
 #define FC_HLEN   (sizeof(struct fch_hdr)+sizeof(struct fcllc))
diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
index c3b1f85..50f8704 100644
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -34,6 +34,9 @@
 #define _IF_PPP_H_
 
 #include <linux/compiler.h>
+#include <linux/if.h>
+#include <linux/ppp_defs.h>
+#include <linux/types.h>
 
 /*
  * Packet sizes
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index a7d6a22..223c09d 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -15,11 +15,8 @@
 #ifndef __LINUX_IF_PPPOL2TP_H
 #define __LINUX_IF_PPPOL2TP_H
 
-#include <asm/types.h>
-
-#ifdef __KERNEL__
+#include <linux/types.h>
 #include <linux/in.h>
-#endif
 
 /* Structure used to connect() the socket to a particular tunnel UDP
  * socket.
diff --git a/include/linux/if_strip.h b/include/linux/if_strip.h
index fb5c5c9..6526a62 100644
--- a/include/linux/if_strip.h
+++ b/include/linux/if_strip.h
@@ -18,6 +18,8 @@
 #ifndef __LINUX_STRIP_H
 #define __LINUX_STRIP_H
 
+#include <linux/types.h>
+
 typedef struct {
     __u8 c[6];
 } MetricomAddress;
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index aeab2cb..edd8799 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -2,6 +2,8 @@
 #define _IF_TUNNEL_H_
 
 #include <linux/types.h>
+#include <asm/byteorder.h>
+#include <linux/if.h>
 #include <linux/ip.h>
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 6e8bc54..bc8c490 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -1,6 +1,8 @@
 #ifndef _INET_DIAG_H_
 #define _INET_DIAG_H_ 1
 
+#include <linux/types.h>
+
 /* Just some random number */
 #define TCPDIAG_GETSOCK 18
 #define DCCPDIAG_GETSOCK 19
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index b323ff5..d5865f0 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -13,6 +13,8 @@
 #ifndef _LINUX_IPV6_ROUTE_H
 #define _LINUX_IPV6_ROUTE_H
 
+#include <linux/in6.h>
+
 #define RTF_DEFAULT	0x00010000	/* default - learned via ND	*/
 #define RTF_ALLONLINK	0x00020000	/* (deprecated and will be removed)
 					   fallback, no routers on link */
diff --git a/include/linux/ipx.h b/include/linux/ipx.h
index eb19b4e..22d379f 100644
--- a/include/linux/ipx.h
+++ b/include/linux/ipx.h
@@ -2,6 +2,7 @@
 #define _IPX_H_
 #include <linux/sockios.h>
 #include <linux/socket.h>
+#include <linux/types.h>
 #define IPX_NODE_LEN	6
 #define IPX_MTU		576
 
diff --git a/include/linux/irda.h b/include/linux/irda.h
index 28f88ec..5073b21 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -31,6 +31,9 @@
  * this one, or preferably to include <net/irda/irda.h> instead.
  * Jean II */
 
+#include <linux/types.h>
+#include <linux/socket.h>
+
 /* Hint bit positions for first hint byte */
 #define HINT_PNP         0x01
 #define HINT_PDA         0x02
diff --git a/include/linux/isdn_divertif.h b/include/linux/isdn_divertif.h
index 07821ca..363ab57 100644
--- a/include/linux/isdn_divertif.h
+++ b/include/linux/isdn_divertif.h
@@ -10,6 +10,7 @@
  *
  */
 
+#include <linux/types.h>
 
 /***********************************************************/
 /* magic value is also used to control version information */
diff --git a/include/linux/llc.h b/include/linux/llc.h
index 7733585..64ac7ed 100644
--- a/include/linux/llc.h
+++ b/include/linux/llc.h
@@ -12,6 +12,10 @@
  *
  * See the GNU General Public License for more details.
  */
+
+#include <linux/if.h>
+#include <linux/socket.h>
+
 #define __LLC_SOCK_SIZE__ 16	/* sizeof(sockaddr_llc), word align. */
 struct sockaddr_llc {
 	sa_family_t     sllc_family;	/* AF_LLC */
diff --git a/include/linux/minix_fs.h b/include/linux/minix_fs.h
index 0e39745..c12bf47 100644
--- a/include/linux/minix_fs.h
+++ b/include/linux/minix_fs.h
@@ -2,6 +2,7 @@
 #define _LINUX_MINIX_FS_H
 
 #include <linux/magic.h>
+#include <linux/types.h>
 
 /*
  * The minix filesystem constants/structures
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index e52ce47..69bd9e0 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -1,6 +1,8 @@
 #ifndef _X_TABLES_H
 #define _X_TABLES_H
 
+#include <linux/types.h>
+
 #define XT_FUNCTION_MAXNAMELEN 30
 #define XT_TABLE_MAXNAMELEN 32
 
diff --git a/include/linux/netrom.h b/include/linux/netrom.h
index 6939b32..af7313c 100644
--- a/include/linux/netrom.h
+++ b/include/linux/netrom.h
@@ -7,6 +7,8 @@
 #ifndef	NETROM_KERNEL_H
 #define	NETROM_KERNEL_H
 
+#include <linux/ax25.h>
+
 #define NETROM_MTU	236
 
 #define NETROM_T1	1
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 15a9f3b..91a1c24 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -37,6 +37,8 @@
 #ifndef NFS_IDMAP_H
 #define NFS_IDMAP_H
 
+#include <linux/types.h>
+
 /* XXX from bits/utmp.h  */
 #define IDMAP_NAMESZ  128
 
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h
index 4e43976..4639a89 100644
--- a/include/linux/nfsd/syscall.h
+++ b/include/linux/nfsd/syscall.h
@@ -10,10 +10,8 @@
 #define NFSD_SYSCALL_H
 
 #include <asm/types.h>
-#ifdef __KERNEL__
-# include <linux/types.h>
-# include <linux/in.h>
-#endif 
+#include <linux/types.h>
+#include <linux/in.h>
 #include <linux/posix_types.h>
 #include <linux/nfsd/const.h>
 #include <linux/nfsd/export.h>
diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index c435507..bd31554 100644
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -12,6 +12,8 @@
 #ifndef LINUX_NUBUS_H
 #define LINUX_NUBUS_H
 
+#include <linux/types.h>
+
 #ifdef __KERNEL__
 #include <asm/nubus.h>
 #endif
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 7cf7824..aa4f39f 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -2,6 +2,7 @@
 #define __LINUX_PKT_CLS_H
 
 #include <linux/pkt_sched.h>
+#include <linux/types.h>
 
 /* I think i could have done better macros ; for now this is stolen from
  * some arch/mips code - jhs
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 5d921fa..41ead7a 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_PKT_SCHED_H
 #define __LINUX_PKT_SCHED_H
 
+#include <linux/types.h>
+
 /* Logical priority bands not depending on specific packet scheduler.
    Every scheduler will map them to real traffic classes, if it has
    no more precise mechanism to classify packets.
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index 6e8adc7..428017e 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -40,6 +40,8 @@
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 
+#include <linux/types.h>
+
 /*
  * The basic PPP frame.
  */
diff --git a/include/linux/random.h b/include/linux/random.h
index 36f125c..aed58cf 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -8,6 +8,7 @@
 #define _LINUX_RANDOM_H
 
 #include <linux/ioctl.h>
+#include <linux/types.h>
 
 /* ioctl()'s for the random number generator */
 
diff --git a/include/linux/romfs_fs.h b/include/linux/romfs_fs.h
index e20bbf9..1404f8d 100644
--- a/include/linux/romfs_fs.h
+++ b/include/linux/romfs_fs.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_ROMFS_FS_H
 #define __LINUX_ROMFS_FS_H
 
+#include <linux/types.h>
+
 /* The basic structures of the romfs filesystem */
 
 #define ROMBSIZE BLOCK_SIZE
diff --git a/include/linux/rose.h b/include/linux/rose.h
index c7b4b18..5bcbba1 100644
--- a/include/linux/rose.h
+++ b/include/linux/rose.h
@@ -7,6 +7,9 @@
 #ifndef	ROSE_KERNEL_H
 #define	ROSE_KERNEL_H
 
+#include <linux/socket.h>
+#include <linux/ax25.h>
+
 #define ROSE_MTU	251
 
 #define ROSE_MAX_DIGIS 6
diff --git a/include/linux/scc.h b/include/linux/scc.h
index 3495bd9..d5916e5 100644
--- a/include/linux/scc.h
+++ b/include/linux/scc.h
@@ -3,6 +3,7 @@
 #ifndef	_SCC_H
 #define	_SCC_H
 
+#include <linux/sockios.h>
 
 /* selection of hardware types */
 
diff --git a/include/linux/selinux_netlink.h b/include/linux/selinux_netlink.h
index bbf489d..faf9675 100644
--- a/include/linux/selinux_netlink.h
+++ b/include/linux/selinux_netlink.h
@@ -12,6 +12,8 @@
 #ifndef _LINUX_SELINUX_NETLINK_H
 #define _LINUX_SELINUX_NETLINK_H
 
+#include <linux/types.h>
+
 /* Message types. */
 #define SELNL_MSG_BASE 0x10
 enum {
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index c844a22..510c2db 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -11,6 +11,9 @@
 
 #ifndef _SYNCLINK_H_
 #define _SYNCLINK_H_
+
+#include <linux/types.h>
+
 #define SYNCLINK_H_VERSION 3.6
 
 #define BIT0	0x0001
diff --git a/include/linux/times.h b/include/linux/times.h
index e2d3020..813446f 100644
--- a/include/linux/times.h
+++ b/include/linux/times.h
@@ -2,6 +2,7 @@
 #define _LINUX_TIMES_H
 
 #include <linux/types.h>
+#include <linux/time.h>
 
 struct tms {
 	clock_t tms_utime;
diff --git a/include/linux/un.h b/include/linux/un.h
index 45561c5..77371f5 100644
--- a/include/linux/un.h
+++ b/include/linux/un.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_UN_H
 #define _LINUX_UN_H
 
+#include <linux/socket.h>
+
 #define UNIX_PATH_MAX	108
 
 struct sockaddr_un {
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h
index 121e26d..e26c0c8 100644
--- a/include/linux/video_decoder.h
+++ b/include/linux/video_decoder.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_VIDEO_DECODER_H
 #define _LINUX_VIDEO_DECODER_H
 
+#include <linux/types.h>
+
 #define HAVE_VIDEO_DECODER 1
 
 struct video_decoder_capability { /* this name is too long */
diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h
index 4b0e690..b7b6423 100644
--- a/include/linux/video_encoder.h
+++ b/include/linux/video_encoder.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_VIDEO_ENCODER_H
 #define _LINUX_VIDEO_ENCODER_H
 
+#include <linux/types.h>
+
 struct video_encoder_capability { /* this name is too long */
 	__u32	flags;
 #define	VIDEO_ENCODER_PAL	1	/* can encode PAL signal */
diff --git a/include/linux/x25.h b/include/linux/x25.h
index d035e4e..00dcc34 100644
--- a/include/linux/x25.h
+++ b/include/linux/x25.h
@@ -12,6 +12,7 @@
 #define	X25_KERNEL_H
 
 #include <linux/types.h>
+#include <linux/socket.h>
 
 #define	SIOCX25GSUBSCRIP	(SIOCPROTOPRIVATE + 0)
 #define	SIOCX25SSUBSCRIP	(SIOCPROTOPRIVATE + 1)
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0014-HACK-asm-pull-in-C-library-headers.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0014-HACK-asm-pull-in-C-library-headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0014-HACK-asm-pull-in-C-library-headers.patch?rev=1.1&content-type=text/plain

Index: 0014-HACK-asm-pull-in-C-library-headers.patch
===================================================================
From 16aff1c4ce528abf63fa738307224ceb6421fbad Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 07:39:14 -0500
Subject: [PATCH] HACK: asm/*: pull in C library headers

Pull in the libc versions of these headers so that the proper
userspace defines/typedefs are utilized.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/asm-generic/fcntl.h   |    5 +++++
 include/asm-generic/siginfo.h |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index b847741..ab7fd64 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -1,6 +1,11 @@
 #ifndef _ASM_GENERIC_FCNTL_H
 #define _ASM_GENERIC_FCNTL_H
 
+/* Pull in fcntl structs from the libc #244470 */
+#include <fcntl.h>
+#define HAVE_ARCH_STRUCT_FLOCK
+#define HAVE_ARCH_STRUCT_FLOCK64
+
 #include <linux/types.h>
 
 /* open/fcntl - O_SYNC is only implemented on blocks devices and on files
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 9695701..6ec8983 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -1,6 +1,10 @@
 #ifndef _ASM_GENERIC_SIGINFO_H
 #define _ASM_GENERIC_SIGINFO_H
 
+#ifndef __KERNEL__
+# include <signal.h>
+#else
+
 #include <linux/compiler.h>
 #include <linux/types.h>
 
@@ -269,7 +273,6 @@ typedef struct sigevent {
 #define sigev_notify_attributes	_sigev_un._sigev_thread._attribute
 #define sigev_notify_thread_id	 _sigev_un._tid
 
-#ifdef __KERNEL__
 
 struct siginfo;
 void do_schedule_next_timer(struct siginfo *info);
-- 
1.6.0.6




1.1                  src/patchsets/gentoo-headers/2.6.28/0015-HACK-linux-pull-in-C-library-headers.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0015-HACK-linux-pull-in-C-library-headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gentoo-headers/2.6.28/0015-HACK-linux-pull-in-C-library-headers.patch?rev=1.1&content-type=text/plain

Index: 0015-HACK-linux-pull-in-C-library-headers.patch
===================================================================
From 958b7b63cb221eec91fa25a6aa884eb14341f3a6 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 29 Dec 2008 07:40:08 -0500
Subject: [PATCH] HACK: linux/*: pull in C library headers

pull in the libc versions of these headers so that the proper userspace
defines/typedefs are utilized.

the trouble here is that some of the linux/ headers define structs that the
libc net/ headers define (like the if.h header).  we cannot simply say
"your program should not include linux/if.h when using net/if.h" because some
of the other linux/ headers may correctly be utilized with net/if.h but they
correctly include linux/if.h.  we also cannot say "just use the linux/ headers
and not the libc net/ headers" because the libc headers include more
definitions than its kernel equivalent.

since there is no obvious (at least to me) answer here, we hack the linux/
headers to simply pull in userspace headers and ignore the linux/ ones
completely.  this seems to give a proper clean userspace experience.

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 include/linux/cdrom.h  |    4 +++
 include/linux/if.h     |    8 +++--
 include/linux/in.h     |   66 ++++++++++++++++++++++++++++++++++++++++-------
 include/linux/in6.h    |   11 +++----
 include/linux/ip.h     |    3 +-
 include/linux/socket.h |    5 +++
 include/linux/stat.h   |    4 +++
 include/linux/time.h   |    6 ++++
 include/linux/types.h  |    1 +
 9 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 0b49e08..257a03d 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -11,6 +11,10 @@
 #ifndef	_LINUX_CDROM_H
 #define	_LINUX_CDROM_H
 
+#ifndef __KERNEL__
+# include <limits.h>
+#endif
+
 #include <asm/byteorder.h>
 
 /*******************************************************
diff --git a/include/linux/if.h b/include/linux/if.h
index 6524684..0ef24c6 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -19,6 +19,8 @@
 #ifndef _LINUX_IF_H
 #define _LINUX_IF_H
 
+#include <net/if.h>
+
 #include <linux/types.h>		/* for "__kernel_caddr_t" et al	*/
 #include <linux/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/compiler.h>		/* for "__user" et al           */
@@ -120,7 +122,7 @@ enum {
  *	being very small might be worth keeping for clean configuration.
  */
 
-struct ifmap 
+struct __kernel_ifmap
 {
 	unsigned long mem_start;
 	unsigned long mem_end;
@@ -156,7 +158,7 @@ struct if_settings
  * remainder may be interface specific.
  */
 
-struct ifreq 
+struct __kernel_ifreq
 {
 #define IFHWADDRLEN	6
 	union
@@ -206,7 +208,7 @@ struct ifreq
  * must know all networks accessible).
  */
 
-struct ifconf 
+struct __kernel_ifconf
 {
 	int	ifc_len;			/* size of buffer	*/
 	union 
diff --git a/include/linux/in.h b/include/linux/in.h
index db458be..c7643a7 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -18,42 +18,88 @@
 #ifndef _LINUX_IN_H
 #define _LINUX_IN_H
 
+#include <netinet/in.h>
+
 #include <linux/types.h>
 #include <linux/socket.h>
 
 /* Standard well-defined IP protocols.  */
 enum {
+#ifndef IPPROTO_IP
   IPPROTO_IP = 0,		/* Dummy protocol for TCP		*/
+#endif
+#ifndef IPPROTO_ICMP
   IPPROTO_ICMP = 1,		/* Internet Control Message Protocol	*/
+#endif
+#ifndef IPPROTO_IGMP
   IPPROTO_IGMP = 2,		/* Internet Group Management Protocol	*/
+#endif
+#ifndef IPPROTO_IPIP
   IPPROTO_IPIP = 4,		/* IPIP tunnels (older KA9Q tunnels use 94) */
+#endif
+#ifndef IPPROTO_TCP
   IPPROTO_TCP = 6,		/* Transmission Control Protocol	*/
+#endif
+#ifndef IPPROTO_EGP
   IPPROTO_EGP = 8,		/* Exterior Gateway Protocol		*/
+#endif
+#ifndef IPPROTO_PUP
   IPPROTO_PUP = 12,		/* PUP protocol				*/
+#endif
+#ifndef IPPROTO_UDP
   IPPROTO_UDP = 17,		/* User Datagram Protocol		*/
+#endif
+#ifndef IPPROTO_IDP
   IPPROTO_IDP = 22,		/* XNS IDP protocol			*/
+#endif
+#ifndef IPPROTO_DCCP
   IPPROTO_DCCP = 33,		/* Datagram Congestion Control Protocol */
+#endif
+#ifndef IPPROTO_RSVP
   IPPROTO_RSVP = 46,		/* RSVP protocol			*/
+#endif
+#ifndef IPPROTO_GRE
   IPPROTO_GRE = 47,		/* Cisco GRE tunnels (rfc 1701,1702)	*/
+#endif
 
+#ifndef IPPROTO_IPV6
   IPPROTO_IPV6	 = 41,		/* IPv6-in-IPv4 tunnelling		*/
+#endif
 
+#ifndef IPPROTO_ESP
   IPPROTO_ESP = 50,            /* Encapsulation Security Payload protocol */
+#endif
+#ifndef IPPROTO_AH
   IPPROTO_AH = 51,             /* Authentication Header protocol       */
+#endif
+#ifndef IPPROTO_BEETPH
   IPPROTO_BEETPH = 94,	       /* IP option pseudo header for BEET */
+#endif
+#ifndef IPPROTO_PIM
   IPPROTO_PIM    = 103,		/* Protocol Independent Multicast	*/
+#endif
 
+#ifndef IPPROTO_COMP
   IPPROTO_COMP   = 108,                /* Compression Header protocol */
+#endif
+#ifndef IPPROTO_SCTP
   IPPROTO_SCTP   = 132,		/* Stream Control Transport Protocol	*/
+#endif
+#ifndef IPPROTO_UDPLITE
   IPPROTO_UDPLITE = 136,	/* UDP-Lite (RFC 3828)			*/
+#endif
 
+#ifndef IPPROTO_RAW
   IPPROTO_RAW	 = 255,		/* Raw IP packets			*/
+#endif
+#if 0
   IPPROTO_MAX
+#endif
 };
 
 
 /* Internet address. */
-struct in_addr {
+struct __kernel_in_addr {
 	__be32	s_addr;
 };
 
@@ -113,26 +159,26 @@ struct in_addr {
 
 /* Request struct for multicast socket ops */
 
-struct ip_mreq 
+struct __kernel_ip_mreq
 {
 	struct in_addr imr_multiaddr;	/* IP multicast address of group */
 	struct in_addr imr_interface;	/* local IP address of interface */
 };
 
-struct ip_mreqn
+struct __kernel_ip_mreqn
 {
 	struct in_addr	imr_multiaddr;		/* IP multicast address of group */
 	struct in_addr	imr_address;		/* local IP address of interface */
 	int		imr_ifindex;		/* Interface index */
 };
 
-struct ip_mreq_source {
+struct __kernel_ip_mreq_source {
 	__be32		imr_multiaddr;
 	__be32		imr_interface;
 	__be32		imr_sourceaddr;
 };
 
-struct ip_msfilter {
+struct __kernel_ip_msfilter {
 	__be32		imsf_multiaddr;
 	__be32		imsf_interface;
 	__u32		imsf_fmode;
@@ -144,20 +190,20 @@ struct ip_msfilter {
 	(sizeof(struct ip_msfilter) - sizeof(__u32) \
 	+ (numsrc) * sizeof(__u32))
 
-struct group_req
+struct __kernel_group_req
 {
 	__u32				 gr_interface;	/* interface index */
 	struct __kernel_sockaddr_storage gr_group;	/* group address */
 };
 
-struct group_source_req
+struct __kernel_group_source_req
 {
 	__u32				 gsr_interface;	/* interface index */
 	struct __kernel_sockaddr_storage gsr_group;	/* group address */
 	struct __kernel_sockaddr_storage gsr_source;	/* source address */
 };
 
-struct group_filter
+struct __kernel_group_filter
 {
 	__u32				 gf_interface;	/* interface index */
 	struct __kernel_sockaddr_storage gf_group;	/* multicast address */
@@ -170,7 +216,7 @@ struct group_filter
 	(sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
 	+ (numsrc) * sizeof(struct __kernel_sockaddr_storage))
 
-struct in_pktinfo
+struct __kernel_in_pktinfo
 {
 	int		ipi_ifindex;
 	struct in_addr	ipi_spec_dst;
@@ -179,7 +225,7 @@ struct in_pktinfo
 
 /* Structure describing an Internet (IP) socket address. */
 #define __SOCK_SIZE__	16		/* sizeof(struct sockaddr)	*/
-struct sockaddr_in {
+struct __kernel_sockaddr_in {
   sa_family_t		sin_family;	/* Address family		*/
   __be16		sin_port;	/* Port number			*/
   struct in_addr	sin_addr;	/* Internet address		*/
diff --git a/include/linux/in6.h b/include/linux/in6.h
index bc49204..28c949c 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -21,13 +21,15 @@
 #ifndef _LINUX_IN6_H
 #define _LINUX_IN6_H
 
+#include <netinet/in.h>
+
 #include <linux/types.h>
 
 /*
  *	IPv6 address structure
  */
 
-struct in6_addr
+struct __kernel_in6_addr
 {
 	union 
 	{
@@ -35,9 +37,6 @@ struct in6_addr
 		__be16		u6_addr16[8];
 		__be32		u6_addr32[4];
 	} in6_u;
-#define s6_addr			in6_u.u6_addr8
-#define s6_addr16		in6_u.u6_addr16
-#define s6_addr32		in6_u.u6_addr32
 };
 
 /* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553
@@ -57,7 +56,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
 		{ { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } }
 #endif
 
-struct sockaddr_in6 {
+struct __kernel_sockaddr_in6 {
 	unsigned short int	sin6_family;    /* AF_INET6 */
 	__be16			sin6_port;      /* Transport layer port # */
 	__be32			sin6_flowinfo;  /* IPv6 flow information */
@@ -65,7 +64,7 @@ struct sockaddr_in6 {
 	__u32			sin6_scope_id;  /* scope id (new in RFC2553) */
 };
 
-struct ipv6_mreq {
+struct __kernel_ipv6_mreq {
 	/* IPv6 multicast address of group */
 	struct in6_addr ipv6mr_multiaddr;
 
diff --git a/include/linux/ip.h b/include/linux/ip.h
index bd0a2a8..19619cc 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -16,6 +16,7 @@
  */
 #ifndef _LINUX_IP_H
 #define _LINUX_IP_H
+#include <netinet/ip.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
@@ -82,7 +83,7 @@
 
 #define IPV4_BEET_PHMAXLEN 8
 
-struct iphdr {
+struct __kernel_iphdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)
 	__u8	ihl:4,
 		version:4;
diff --git a/include/linux/socket.h b/include/linux/socket.h
index d9b4492..1c6c14c 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -319,4 +319,9 @@ extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
 
 #endif
 #endif /* not kernel and not glibc */
+
+#ifndef __KERNEL__
+# include <sys/socket.h>
+#endif
+
 #endif /* _LINUX_SOCKET_H */
diff --git a/include/linux/stat.h b/include/linux/stat.h
index 5460344..a90fdb2 100644
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
@@ -77,4 +77,8 @@ struct kstat {
 
 #endif
 
+#ifndef __KERNEL__
+# include <sys/stat.h>
+#endif
+
 #endif
diff --git a/include/linux/time.h b/include/linux/time.h
index ce321ac..f0f9347 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -1,4 +1,10 @@
 #ifndef _LINUX_TIME_H
+# include <time.h>
+# include <sys/time.h>
+# define _LINUX_TIME_H
+#endif
+
+#ifndef _LINUX_TIME_H
 #define _LINUX_TIME_H
 
 #include <linux/types.h>
diff --git a/include/linux/types.h b/include/linux/types.h
index a999d0c..8a2be87 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -8,6 +8,7 @@
 
 #endif
 
+#include <sys/types.h>
 #include <linux/posix_types.h>
 #include <asm/types.h>
 
-- 
1.6.0.6