path: root/2.6.30/0006-linux-pull-in-other-needed-headers-for-userspace.patch

From 9899edc463ab34a5e41d7483273a1595f3df5e1a Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 29 Dec 2008 07:41:01 -0500
Subject: [PATCH 6/9] linux/*: pull in other needed headers for userspace

mondo patch

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/linux/atalk.h         |    1 +
 include/linux/atm_zatm.h      |    1 +
 include/linux/auto_fs4.h      |    2 ++
 include/linux/cm4000_cs.h     |    1 +
 include/linux/dn.h            |    3 +++
 include/linux/efs_fs_sb.h     |    1 +
 include/linux/elfcore.h       |    1 -
 include/linux/ext2_fs.h       |    1 +
 include/linux/hdlc/ioctl.h    |    1 +
 include/linux/if_ppp.h        |    3 +++
 include/linux/if_pppol2tp.h   |    3 ---
 include/linux/if_tunnel.h     |    5 ++---
 include/linux/ipv6_route.h    |    1 +
 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/netrom.h        |    2 ++
 include/linux/nfsd/syscall.h  |    2 --
 include/linux/pkt_cls.h       |    1 +
 include/linux/ppp_defs.h      |    2 ++
 include/linux/romfs_fs.h      |    2 ++
 include/linux/rose.h          |    3 +++
 include/linux/scc.h           |    1 +
 include/linux/synclink.h      |    3 +++
 include/linux/times.h         |    1 +
 include/linux/un.h            |    2 ++
 include/linux/x25.h           |    1 +
 29 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index d34c187..a2ce5e7 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.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_fs4.h b/include/linux/auto_fs4.h
index 8b49ac4..ffc496e 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/types.h>
 #include <linux/auto_fs.h>
diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
index 72bfefd..b179b68 100644
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
@@ -2,6 +2,7 @@
 #define	_CM4000_H_
 
 #include <linux/types.h>
+#include <linux/ioctl.h>
 
 #define	MAX_ATR			33
 
diff --git a/include/linux/dn.h b/include/linux/dn.h
index fe99908..91c156e 100644
--- a/include/linux/dn.h
+++ b/include/linux/dn.h
@@ -9,6 +9,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 a01be90..48deb4f 100644
--- a/include/linux/efs_fs_sb.h
+++ b/include/linux/efs_fs_sb.h
@@ -11,6 +11,7 @@
 
 #include <linux/types.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 7605c5e..908ba1e 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/ext2_fs.h b/include/linux/ext2_fs.h
index 121720d..ca1961c 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/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/if_ppp.h b/include/linux/if_ppp.h
index fcef103..047d9cf 100644
--- a/include/linux/if_ppp.h
+++ b/include/linux/if_ppp.h
@@ -35,6 +35,9 @@
 
 #include <linux/types.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 3a14b08..a0e9841 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -16,10 +16,7 @@
 #define __LINUX_IF_PPPOL2TP_H
 
 #include <linux/types.h>
-
-#ifdef __KERNEL__
 #include <linux/in.h>
-#endif
 
 /* Structure used to connect() the socket to a particular tunnel UDP
  * socket.
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 5a9aae4..52e2fde 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -2,10 +2,9 @@
 #define _IF_TUNNEL_H_
 
 #include <linux/types.h>
-
-#ifdef __KERNEL__
+#include <asm/byteorder.h>
+#include <linux/if.h>
 #include <linux/ip.h>
-#endif
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
 #define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index 1e7d8af..bee1e83 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -14,6 +14,7 @@
 #define _LINUX_IPV6_ROUTE_H
 
 #include <linux/types.h>
+#include <linux/in6.h>
 
 #define RTF_DEFAULT	0x00010000	/* default - learned via ND	*/
 #define RTF_ALLONLINK	0x00020000	/* (deprecated and will be removed)
diff --git a/include/linux/ipx.h b/include/linux/ipx.h
index aabb1d2..cb70c09 100644
--- a/include/linux/ipx.h
+++ b/include/linux/ipx.h
@@ -3,6 +3,7 @@
 #include <linux/types.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 00bdad0..c9bf1e5 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -33,6 +33,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 13fe09e..c13b953 100644
--- a/include/linux/minix_fs.h
+++ b/include/linux/minix_fs.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 #include <linux/magic.h>
+#include <linux/types.h>
 
 /*
  * The minix filesystem constants/structures
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/nfsd/syscall.h b/include/linux/nfsd/syscall.h
index 7a3b565..f43a81b 100644
--- a/include/linux/nfsd/syscall.h
+++ b/include/linux/nfsd/syscall.h
@@ -10,9 +10,7 @@
 #define NFSD_SYSCALL_H
 
 # include <linux/types.h>
-#ifdef __KERNEL__
 # include <linux/in.h>
-#endif 
 #include <linux/posix_types.h>
 #include <linux/nfsd/const.h>
 #include <linux/nfsd/export.h>
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 3c842ed..562db89 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.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/ppp_defs.h b/include/linux/ppp_defs.h
index 0f93ed6..6fdc843 100644
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -42,6 +42,8 @@
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 
+#include <linux/types.h>
+
 /*
  * The basic PPP frame.
  */
diff --git a/include/linux/romfs_fs.h b/include/linux/romfs_fs.h
index c490fbc..2a0269a 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/synclink.h b/include/linux/synclink.h
index 0ff2779..aec6662 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
 
 #include <linux/types.h>
diff --git a/include/linux/times.h b/include/linux/times.h
index 87b6261..a449fd0 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 {
 	__kernel_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/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.3.3