Commit 45c82b5a authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'header-fixes-for-linus' of...

Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (90 commits)
  headers_check fix: x86, swab.h
  headers_check fix: x86, sigcontext32.h
  headers_check fix: x86, sigcontext.h
  headers_check fix: x86, ptrace-abi.h
  headers_check fix: x86, mtrr.h
  headers_check fix: x86, mce.h
  headers_check fix: x86, kvm.h
  headers_check fix: x86, e820.h
  headers_check fix: linux/rtnetlink.h
  headers_check fix: linux/nubus.h
  headers_check fix: video/uvesafb.h
  headers_check fix: video/sisfb.h
  headers_check fix: sound/hdsp.h
  headers_check fix: mtd/inftl-user.h
  headers_check fix: linux/virtio_net.h
  headers_check fix: linux/virtio_console.h
  headers_check fix: linux/virtio_blk.h
  headers_check fix: linux/videodev.h
  headers_check fix: linux/video_encoder.h
  headers_check fix: linux/video_decoder.h
  ...
parents 1347e965 7cff3608
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#define E820_RESERVED_KERN 128 #define E820_RESERVED_KERN 128
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/types.h>
struct e820entry { struct e820entry {
__u64 addr; /* start of memory segment */ __u64 addr; /* start of memory segment */
__u64 size; /* size of memory segment */ __u64 size; /* size of memory segment */
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
*/ */
#include <asm/types.h> #include <linux/types.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
/* Architectural interrupt line count. */ /* Architectural interrupt line count. */
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#ifdef __x86_64__ #ifdef __x86_64__
#include <linux/types.h>
#include <asm/ioctls.h> #include <asm/ioctls.h>
#include <asm/types.h>
/* /*
* Machine Check support for x86 * Machine Check support for x86
...@@ -115,8 +115,6 @@ extern int mce_notify_user(void); ...@@ -115,8 +115,6 @@ extern int mce_notify_user(void);
#endif /* !CONFIG_X86_32 */ #endif /* !CONFIG_X86_32 */
#ifdef CONFIG_X86_MCE #ifdef CONFIG_X86_MCE
extern void mcheck_init(struct cpuinfo_x86 *c); extern void mcheck_init(struct cpuinfo_x86 *c);
#else #else
...@@ -126,5 +124,4 @@ extern void stop_mce(void); ...@@ -126,5 +124,4 @@ extern void stop_mce(void);
extern void restart_mce(void); extern void restart_mce(void);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_X86_MCE_H */ #endif /* _ASM_X86_MCE_H */
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#ifndef _ASM_X86_MTRR_H #ifndef _ASM_X86_MTRR_H
#define _ASM_X86_MTRR_H #define _ASM_X86_MTRR_H
#include <linux/types.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/errno.h> #include <linux/errno.h>
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
#ifdef CONFIG_X86_PTRACE_BTS #ifdef CONFIG_X86_PTRACE_BTS
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/types.h> #include <linux/types.h>
/* configuration/status structure used in PTRACE_BTS_CONFIG and /* configuration/status structure used in PTRACE_BTS_CONFIG and
PTRACE_BTS_STATUS commands. PTRACE_BTS_STATUS commands.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _ASM_X86_SIGCONTEXT_H #define _ASM_X86_SIGCONTEXT_H
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/types.h> #include <linux/types.h>
#define FP_XSTATE_MAGIC1 0x46505853U #define FP_XSTATE_MAGIC1 0x46505853U
#define FP_XSTATE_MAGIC2 0x46505845U #define FP_XSTATE_MAGIC2 0x46505845U
......
#ifndef _ASM_X86_SIGCONTEXT32_H #ifndef _ASM_X86_SIGCONTEXT32_H
#define _ASM_X86_SIGCONTEXT32_H #define _ASM_X86_SIGCONTEXT32_H
#include <linux/types.h>
/* signal context for 32bit programs. */ /* signal context for 32bit programs. */
#define X86_FXSR_MAGIC 0x0000 #define X86_FXSR_MAGIC 0x0000
......
#ifndef _ASM_X86_SWAB_H #ifndef _ASM_X86_SWAB_H
#define _ASM_X86_SWAB_H #define _ASM_X86_SWAB_H
#include <asm/types.h> #include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
static inline __attribute_const__ __u32 __arch_swab32(__u32 val) static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#ifndef __LINUX__AIO_ABI_H #ifndef __LINUX__AIO_ABI_H
#define __LINUX__AIO_ABI_H #define __LINUX__AIO_ABI_H
#include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
typedef unsigned long aio_context_t; typedef unsigned long aio_context_t;
......
#ifndef __LINUX_ATALK_H__ #ifndef __LINUX_ATALK_H__
#define __LINUX_ATALK_H__ #define __LINUX_ATALK_H__
#include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
/* /*
......
#ifndef _LINUX_ATMBR2684_H #ifndef _LINUX_ATMBR2684_H
#define _LINUX_ATMBR2684_H #define _LINUX_ATMBR2684_H
#include <linux/types.h>
#include <linux/atm.h> #include <linux/atm.h>
#include <linux/if.h> /* For IFNAMSIZ */ #include <linux/if.h> /* For IFNAMSIZ */
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#define _LINUX_AUTO_FS4_H #define _LINUX_AUTO_FS4_H
/* Include common v3 definitions */ /* Include common v3 definitions */
#include <linux/types.h>
#include <linux/auto_fs.h> #include <linux/auto_fs.h>
/* autofs v4 definitions */ /* autofs v4 definitions */
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef _LINUX_BFS_FS_H #ifndef _LINUX_BFS_FS_H
#define _LINUX_BFS_FS_H #define _LINUX_BFS_FS_H
#include <linux/types.h>
#define BFS_BSIZE_BITS 9 #define BFS_BSIZE_BITS 9
#define BFS_BSIZE (1<<BFS_BSIZE_BITS) #define BFS_BSIZE (1<<BFS_BSIZE_BITS)
...@@ -17,7 +19,6 @@ ...@@ -17,7 +19,6 @@
#define BFS_VDIR 2L #define BFS_VDIR 2L
#define BFS_VREG 1L #define BFS_VREG 1L
/* BFS inode layout on disk */ /* BFS inode layout on disk */
struct bfs_inode { struct bfs_inode {
__le16 i_ino; __le16 i_ino;
......
#ifndef BLKTRACE_H #ifndef BLKTRACE_H
#define BLKTRACE_H #define BLKTRACE_H
#include <linux/types.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/relay.h> #include <linux/relay.h>
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#ifndef CAN_BCM_H #ifndef CAN_BCM_H
#define CAN_BCM_H #define CAN_BCM_H
#include <linux/types.h>
/** /**
* struct bcm_msg_head - head of messages to/from the broadcast manager * struct bcm_msg_head - head of messages to/from the broadcast manager
* @opcode: opcode, see enum below. * @opcode: opcode, see enum below.
......
...@@ -69,10 +69,6 @@ typedef struct __user_cap_data_struct { ...@@ -69,10 +69,6 @@ typedef struct __user_cap_data_struct {
#define VFS_CAP_U32 VFS_CAP_U32_2 #define VFS_CAP_U32 VFS_CAP_U32_2
#define VFS_CAP_REVISION VFS_CAP_REVISION_2 #define VFS_CAP_REVISION VFS_CAP_REVISION_2
#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
extern int file_caps_enabled;
#endif
struct vfs_cap_data { struct vfs_cap_data {
__le32 magic_etc; /* Little endian */ __le32 magic_etc; /* Little endian */
struct { struct {
...@@ -96,6 +92,10 @@ struct vfs_cap_data { ...@@ -96,6 +92,10 @@ struct vfs_cap_data {
#define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3 #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
#define _KERNEL_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3 #define _KERNEL_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3
#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
extern int file_caps_enabled;
#endif
typedef struct kernel_cap_struct { typedef struct kernel_cap_struct {
__u32 cap[_KERNEL_CAPABILITY_U32S]; __u32 cap[_KERNEL_CAPABILITY_U32S];
} kernel_cap_t; } kernel_cap_t;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#ifndef _LINUX_CDROM_H #ifndef _LINUX_CDROM_H
#define _LINUX_CDROM_H #define _LINUX_CDROM_H
#include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
/******************************************************* /*******************************************************
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#ifndef _LINUX_CGROUPSTATS_H #ifndef _LINUX_CGROUPSTATS_H
#define _LINUX_CGROUPSTATS_H #define _LINUX_CGROUPSTATS_H
#include <linux/types.h>
#include <linux/taskstats.h> #include <linux/taskstats.h>
/* /*
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#ifndef __DLM_PLOCK_DOT_H__ #ifndef __DLM_PLOCK_DOT_H__
#define __DLM_PLOCK_DOT_H__ #define __DLM_PLOCK_DOT_H__
#include <linux/types.h>
#define DLM_PLOCK_MISC_NAME "dlm_plock" #define DLM_PLOCK_MISC_NAME "dlm_plock"
#define DLM_PLOCK_VERSION_MAJOR 1 #define DLM_PLOCK_VERSION_MAJOR 1
......
#ifndef _LINUX_DN_H #ifndef _LINUX_DN_H
#define _LINUX_DN_H #define _LINUX_DN_H
#include <linux/types.h>
/* /*
DECnet Data Structures and Constants DECnet Data Structures and Constants
......
...@@ -24,12 +24,7 @@ ...@@ -24,12 +24,7 @@
#ifndef _DVBAUDIO_H_ #ifndef _DVBAUDIO_H_
#define _DVBAUDIO_H_ #define _DVBAUDIO_H_
#ifdef __KERNEL__
#include <linux/types.h> #include <linux/types.h>
#else
#include <stdint.h>
#endif
typedef enum { typedef enum {
AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef _DVBDMX_H_ #ifndef _DVBDMX_H_
#define _DVBDMX_H_ #define _DVBDMX_H_
#include <asm/types.h> #include <linux/types.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/time.h> #include <linux/time.h>
#else #else
......
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
#ifndef _DVBFRONTEND_H_ #ifndef _DVBFRONTEND_H_
#define _DVBFRONTEND_H_ #define _DVBFRONTEND_H_
#include <asm/types.h> #include <linux/types.h>
typedef enum fe_type { typedef enum fe_type {
FE_QPSK, FE_QPSK,
......
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
#ifndef _DVBNET_H_ #ifndef _DVBNET_H_
#define _DVBNET_H_ #define _DVBNET_H_
#include <asm/types.h> #include <linux/types.h>
struct dvb_net_if { struct dvb_net_if {
__u16 pid; __u16 pid;
......
...@@ -24,17 +24,14 @@ ...@@ -24,17 +24,14 @@
#ifndef _DVBVIDEO_H_ #ifndef _DVBVIDEO_H_
#define _DVBVIDEO_H_ #define _DVBVIDEO_H_
#include <linux/compiler.h>
#ifdef __KERNEL__
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__
#include <linux/compiler.h>
#else #else
#include <asm/types.h>
#include <stdint.h> #include <stdint.h>
#include <time.h> #include <time.h>
#endif #endif
typedef enum { typedef enum {
VIDEO_FORMAT_4_3, /* Select 4:3 format */ VIDEO_FORMAT_4_3, /* Select 4:3 format */
VIDEO_FORMAT_16_9, /* Select 16:9 format. */ VIDEO_FORMAT_16_9, /* Select 16:9 format. */
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#ifndef _LINUX_EDD_H #ifndef _LINUX_EDD_H
#define _LINUX_EDD_H #define _LINUX_EDD_H
#include <linux/types.h>
#define EDDNR 0x1e9 /* addr of number of edd_info structs at EDDBUF #define EDDNR 0x1e9 /* addr of number of edd_info structs at EDDBUF
in boot_params - treat this as 1 byte */ in boot_params - treat this as 1 byte */
#define EDDBUF 0xd00 /* addr of edd_info structs in boot_params */ #define EDDBUF 0xd00 /* addr of edd_info structs in boot_params */
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#ifndef __EFS_FS_SB_H__ #ifndef __EFS_FS_SB_H__
#define __EFS_FS_SB_H__ #define __EFS_FS_SB_H__
#include <linux/types.h>
#include <linux/magic.h> #include <linux/magic.h>
/* EFS superblock magic numbers */ /* EFS superblock magic numbers */
......
...@@ -58,11 +58,13 @@ struct elf_fdpic_params { ...@@ -58,11 +58,13 @@ struct elf_fdpic_params {
#define ELF_FDPIC_FLAG_PRESENT 0x80000000 /* T if this object is present */ #define ELF_FDPIC_FLAG_PRESENT 0x80000000 /* T if this object is present */
}; };
#ifdef __KERNEL__
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params, extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params,
struct elf_fdpic_params *interp_params, struct elf_fdpic_params *interp_params,
unsigned long *start_stack, unsigned long *start_stack,
unsigned long *start_brk); unsigned long *start_brk);
#endif #endif
#endif /* __KERNEL__ */
#endif /* _LINUX_ELF_FDPIC_H */ #endif /* _LINUX_ELF_FDPIC_H */
...@@ -377,6 +377,7 @@ typedef struct elf64_note { ...@@ -377,6 +377,7 @@ typedef struct elf64_note {
Elf64_Word n_type; /* Content type */ Elf64_Word n_type; /* Content type */
} Elf64_Nhdr; } Elf64_Nhdr;
#ifdef __KERNEL__
#if ELF_CLASS == ELFCLASS32 #if ELF_CLASS == ELFCLASS32
extern Elf32_Dyn _DYNAMIC []; extern Elf32_Dyn _DYNAMIC [];
...@@ -404,5 +405,5 @@ static inline int elf_coredump_extra_notes_write(struct file *file, ...@@ -404,5 +405,5 @@ 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_size(void);
extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset); extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset);
#endif #endif
#endif /* __KERNEL__ */
#endif /* _LINUX_ELF_H */ #endif /* _LINUX_ELF_H */
#ifndef _LINUX_ERRQUEUE_H #ifndef _LINUX_ERRQUEUE_H
#define _LINUX_ERRQUEUE_H 1 #define _LINUX_ERRQUEUE_H 1
#include <linux/types.h>
struct sock_extended_err struct sock_extended_err
{ {
__u32 ee_errno; __u32 ee_errno;
......
#ifndef __LINUX_GENERIC_NETLINK_H #ifndef __LINUX_GENERIC_NETLINK_H
#define __LINUX_GENERIC_NETLINK_H #define __LINUX_GENERIC_NETLINK_H
#include <linux/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#define GENL_NAMSIZ 16 /* length of family name */ #define GENL_NAMSIZ 16 /* length of family name */
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#ifndef __GFS2_ONDISK_DOT_H__ #ifndef __GFS2_ONDISK_DOT_H__
#define __GFS2_ONDISK_DOT_H__ #define __GFS2_ONDISK_DOT_H__
#include <linux/types.h>
#define GFS2_MAGIC 0x01161970 #define GFS2_MAGIC 0x01161970
#define GFS2_BASIC_BLOCK 512 #define GFS2_BASIC_BLOCK 512
#define GFS2_BASIC_BLOCK_SHIFT 9 #define GFS2_BASIC_BLOCK_SHIFT 9
......
...@@ -791,6 +791,7 @@ dbg_hid(const char *fmt, ...) ...@@ -791,6 +791,7 @@ dbg_hid(const char *fmt, ...)
__FILE__ , ## arg) __FILE__ , ## arg)
#endif /* HID_FF */ #endif /* HID_FF */
#ifdef __KERNEL__
#ifdef CONFIG_HID_COMPAT #ifdef CONFIG_HID_COMPAT
#define HID_COMPAT_LOAD_DRIVER(name) \ #define HID_COMPAT_LOAD_DRIVER(name) \
/* prototype to avoid sparse warning */ \ /* prototype to avoid sparse warning */ \
...@@ -804,6 +805,7 @@ EXPORT_SYMBOL(hid_compat_##name) ...@@ -804,6 +805,7 @@ EXPORT_SYMBOL(hid_compat_##name)
extern void hid_compat_##name(void); \ extern void hid_compat_##name(void); \
hid_compat_##name(); \ hid_compat_##name(); \
} while (0) } while (0)
#endif /* __KERNEL__ */
#endif #endif
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
* Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
*/ */
#include <linux/types.h>
/* /*
* The event structure itself * The event structure itself
*/ */
......
#ifndef _LINUX_ICMPV6_H #ifndef _LINUX_ICMPV6_H
#define _LINUX_ICMPV6_H #define _LINUX_ICMPV6_H
#include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
struct icmp6hdr { struct icmp6hdr {
......
#ifndef __LINUX_IF_ADDR_H #ifndef __LINUX_IF_ADDR_H
#define __LINUX_IF_ADDR_H #define __LINUX_IF_ADDR_H
#include <linux/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>
struct ifaddrmsg struct ifaddrmsg
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#ifndef __LINUX_IF_ADDRLABEL_H #ifndef __LINUX_IF_ADDRLABEL_H
#define __LINUX_IF_ADDRLABEL_H #define __LINUX_IF_ADDRLABEL_H
#include <linux/types.h>
struct ifaddrlblmsg struct ifaddrlblmsg
{ {
__u8 ifal_family; /* Address family */ __u8 ifal_family; /* Address family */
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#ifndef _LINUX_IF_FC_H #ifndef _LINUX_IF_FC_H
#define _LINUX_IF_FC_H #define _LINUX_IF_FC_H
#include <linux/types.h>
#define FC_ALEN 6 /* Octets in one ethernet addr */ #define FC_ALEN 6 /* Octets in one ethernet addr */
#define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc)) #define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc))
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#ifndef _LINUX_IF_HIPPI_H #ifndef _LINUX_IF_HIPPI_H
#define _LINUX_IF_HIPPI_H #define _LINUX_IF_HIPPI_H
#include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
/* /*
......
#ifndef _LINUX_IF_LINK_H #ifndef _LINUX_IF_LINK_H
#define _LINUX_IF_LINK_H #define _LINUX_IF_LINK_H
#include <linux/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>
/* The struct should be in sync with struct net_device_stats */ /* The struct should be in sync with struct net_device_stats */
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#ifndef _IF_PPP_H_ #ifndef _IF_PPP_H_
#define _IF_PPP_H_ #define _IF_PPP_H_
#include <linux/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
/* /*
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#ifndef __LINUX_STRIP_H #ifndef __LINUX_STRIP_H
#define __LINUX_STRIP_H #define __LINUX_STRIP_H
#include <linux/types.h>
typedef struct { typedef struct {
__u8 c[6]; __u8 c[6];
} MetricomAddress; } MetricomAddress;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#ifndef _LINUX_IF_TR_H #ifndef _LINUX_IF_TR_H
#define _LINUX_IF_TR_H #define _LINUX_IF_TR_H
#include <linux/types.h>
#include <asm/byteorder.h> /* For __be16 */ #include <asm/byteorder.h> /* For __be16 */
/* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble /* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#ifndef _LINUX_IGMP_H #ifndef _LINUX_IGMP_H
#define _LINUX_IGMP_H #define _LINUX_IGMP_H
#include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
/* /*
......
#ifndef _INET_DIAG_H_ #ifndef _INET_DIAG_H_
#define _INET_DIAG_H_ 1 #define _INET_DIAG_H_ 1
#include <linux/types.h>
/* Just some random number */ /* Just some random number */
#define TCPDIAG_GETSOCK 18 #define TCPDIAG_GETSOCK 18
#define DCCPDIAG_GETSOCK 19 #define DCCPDIAG_GETSOCK 19
......
#ifndef _IP6_TUNNEL_H #ifndef _IP6_TUNNEL_H
#define _IP6_TUNNEL_H #define _IP6_TUNNEL_H
#include <linux/types.h>
#define IPV6_TLV_TNL_ENCAP_LIMIT 4 #define IPV6_TLV_TNL_ENCAP_LIMIT 4
#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4 #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4
......
#ifndef _IPV6_H #ifndef _IPV6_H
#define _IPV6_H #define _IPV6_H
#include <linux/types.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#ifndef _LINUX_IPV6_ROUTE_H #ifndef _LINUX_IPV6_ROUTE_H
#define _LINUX_IPV6_ROUTE_H #define _LINUX_IPV6_ROUTE_H
#include <linux/types.h>
#define RTF_DEFAULT 0x00010000 /* default - learned via ND */ #define RTF_DEFAULT 0x00010000 /* default - learned via ND */
#define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed) #define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed)
fallback, no routers on link */ fallback, no routers on link */
......
#ifndef _IPX_H_ #ifndef _IPX_H_
#define _IPX_H_ #define _IPX_H_
#include <linux/types.h>
#include <linux/sockios.h> #include <linux/sockios.h>
#include <linux/socket.h> #include <linux/socket.h>
#define IPX_NODE_LEN 6 #define IPX_NODE_LEN 6
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef KERNEL_IRDA_H #ifndef KERNEL_IRDA_H
#define KERNEL_IRDA_H #define KERNEL_IRDA_H
#include <linux/types.h>
/* Please do *not* add any #include in this file, this file is /* Please do *not* add any #include in this file, this file is
* included as-is in user space. * included as-is in user space.
* Please fix the calling file to properly included needed files before * Please fix the calling file to properly included needed files before
......
#ifndef _LINUX_MINIX_FS_H #ifndef _LINUX_MINIX_FS_H
#define _LINUX_MINIX_FS_H #define _LINUX_MINIX_FS_H
#include <linux/types.h>
#include <linux/magic.h> #include <linux/magic.h>
/* /*
......
#ifndef _LINUX_MSDOS_FS_H #ifndef _LINUX_MSDOS_FS_H
#define _LINUX_MSDOS_FS_H #define _LINUX_MSDOS_FS_H
#include <linux/types.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
......
#ifndef __LINUX_NEIGHBOUR_H #ifndef __LINUX_NEIGHBOUR_H
#define __LINUX_NEIGHBOUR_H #define __LINUX_NEIGHBOUR_H
#include <linux/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>
struct ndmsg struct ndmsg
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef _XT_CONNTRACK_H #ifndef _XT_CONNTRACK_H
#define _XT_CONNTRACK_H #define _XT_CONNTRACK_H
#include <linux/types.h>
#include <linux/netfilter/nf_conntrack_tuple_common.h> #include <linux/netfilter/nf_conntrack_tuple_common.h>
#define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1)) #define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#ifndef NFS_IDMAP_H #ifndef NFS_IDMAP_H
#define NFS_IDMAP_H #define NFS_IDMAP_H
#include <linux/types.h>
/* XXX from bits/utmp.h */ /* XXX from bits/utmp.h */
#define IDMAP_NAMESZ 128 #define IDMAP_NAMESZ 128
......
...@@ -10,9 +10,8 @@ ...@@ -10,9 +10,8 @@
#ifndef NFSD_EXPORT_H #ifndef NFSD_EXPORT_H
#define NFSD_EXPORT_H #define NFSD_EXPORT_H
#include <asm/types.h>
#ifdef __KERNEL__
# include <linux/types.h> # include <linux/types.h>
#ifdef __KERNEL__
# include <linux/in.h> # include <linux/in.h>
#endif #endif
......
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
#ifndef _LINUX_NFSD_FH_H #ifndef _LINUX_NFSD_FH_H
#define _LINUX_NFSD_FH_H #define _LINUX_NFSD_FH_H
#include <asm/types.h>
#ifdef __KERNEL__
# include <linux/types.h> # include <linux/types.h>
#ifdef __KERNEL__
# include <linux/string.h> # include <linux/string.h>
# include <linux/fs.h> # include <linux/fs.h>
#endif #endif
......
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
#ifndef NFSD_SYSCALL_H #ifndef NFSD_SYSCALL_H
#define NFSD_SYSCALL_H #define NFSD_SYSCALL_H
#include <asm/types.h>
#ifdef __KERNEL__
# include <linux/types.h> # include <linux/types.h>
#ifdef __KERNEL__
# include <linux/in.h> # include <linux/in.h>
#endif #endif
#include <linux/posix_types.h> #include <linux/posix_types.h>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#ifndef LINUX_NUBUS_H #ifndef LINUX_NUBUS_H
#define LINUX_NUBUS_H #define LINUX_NUBUS_H
#include <linux/types.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/nubus.h> #include <asm/nubus.h>
#endif #endif
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#ifndef LINUX_PHONET_H #ifndef LINUX_PHONET_H
#define LINUX_PHONET_H #define LINUX_PHONET_H
#include <linux/types.h>
/* Automatic protocol selection */ /* Automatic protocol selection */
#define PN_PROTO_TRANSPORT 0 #define PN_PROTO_TRANSPORT 0
/* Phonet datagram socket */ /* Phonet datagram socket */
......
#ifndef __LINUX_PKT_CLS_H #ifndef __LINUX_PKT_CLS_H
#define __LINUX_PKT_CLS_H #define __LINUX_PKT_CLS_H
#include <linux/types.h>
#include <linux/pkt_sched.h> #include <linux/pkt_sched.h>
/* I think i could have done better macros ; for now this is stolen from /* I think i could have done better macros ; for now this is stolen from
......
#ifndef __LINUX_PKT_SCHED_H #ifndef __LINUX_PKT_SCHED_H
#define __LINUX_PKT_SCHED_H #define __LINUX_PKT_SCHED_H
#include <linux/types.h>
/* Logical priority bands not depending on specific packet scheduler. /* Logical priority bands not depending on specific packet scheduler.
Every scheduler will map them to real traffic classes, if it has Every scheduler will map them to real traffic classes, if it has
no more precise mechanism to classify packets. no more precise mechanism to classify packets.
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
* OR MODIFICATIONS. * OR MODIFICATIONS.
*/ */
#include <linux/types.h>
/* /*
* ==FILEVERSION 20000114== * ==FILEVERSION 20000114==
* *
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#ifndef _MD_P_H #ifndef _MD_P_H
#define _MD_P_H #define _MD_P_H
#include <linux/types.h>
/* /*
* RAID superblock. * RAID superblock.
* *
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#ifndef _LINUX_RANDOM_H #ifndef _LINUX_RANDOM_H
#define _LINUX_RANDOM_H #define _LINUX_RANDOM_H
#include <linux/types.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/irqnr.h> #include <linux/irqnr.h>
......
#ifndef __LINUX_RTNETLINK_H #ifndef __LINUX_RTNETLINK_H
#define __LINUX_RTNETLINK_H #define __LINUX_RTNETLINK_H
#include <linux/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/if_link.h> #include <linux/if_link.h>
#include <linux/if_addr.h> #include <linux/if_addr.h>
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#ifndef _LINUX_SIGNALFD_H #ifndef _LINUX_SIGNALFD_H
#define _LINUX_SIGNALFD_H #define _LINUX_SIGNALFD_H
#include <linux/types.h>
/* For O_CLOEXEC and O_NONBLOCK */ /* For O_CLOEXEC and O_NONBLOCK */
#include <linux/fcntl.h> #include <linux/fcntl.h>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define SND_DEV_AMIDI 13 /* Like /dev/midi (obsolete) */ #define SND_DEV_AMIDI 13 /* Like /dev/midi (obsolete) */
#define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */ #define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */
#ifdef __KERNEL__
/* /*
* Sound core interface functions * Sound core interface functions
*/ */
...@@ -40,3 +41,4 @@ extern void unregister_sound_special(int unit); ...@@ -40,3 +41,4 @@ extern void unregister_sound_special(int unit);
extern void unregister_sound_mixer(int unit); extern void unregister_sound_mixer(int unit);
extern void unregister_sound_midi(int unit); extern void unregister_sound_midi(int unit);
extern void unregister_sound_dsp(int unit); extern void unregister_sound_dsp(int unit);
#endif /* __KERNEL__ */
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#ifndef SPIDEV_H #ifndef SPIDEV_H
#define SPIDEV_H #define SPIDEV_H
#include <linux/types.h>
/* User space versions of kernel symbols for SPI clocking modes, /* User space versions of kernel symbols for SPI clocking modes,
* matching <linux/spi/spi.h> * matching <linux/spi/spi.h>
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#define _SYNCLINK_H_ #define _SYNCLINK_H_
#define SYNCLINK_H_VERSION 3.6 #define SYNCLINK_H_VERSION 3.6
#include <linux/types.h>
#define BIT0 0x0001 #define BIT0 0x0001
#define BIT1 0x0002 #define BIT1 0x0002
#define BIT2 0x0004 #define BIT2 0x0004
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#ifndef _LINUX_TASKSTATS_H #ifndef _LINUX_TASKSTATS_H
#define _LINUX_TASKSTATS_H #define _LINUX_TASKSTATS_H
#include <linux/types.h>
/* Format for per-task data returned to userland when /* Format for per-task data returned to userland when
* - a task exits * - a task exits
* - listener requests stats for a task * - listener requests stats for a task
......
#ifndef __LINUX_TC_GACT_H #ifndef __LINUX_TC_GACT_H
#define __LINUX_TC_GACT_H #define __LINUX_TC_GACT_H
#include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
#define TCA_ACT_GACT 5 #define TCA_ACT_GACT 5
......
#ifndef __LINUX_TC_MIR_H #ifndef __LINUX_TC_MIR_H
#define __LINUX_TC_MIR_H #define __LINUX_TC_MIR_H
#include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
#define TCA_ACT_MIRRED 8 #define TCA_ACT_MIRRED 8
......
#ifndef __LINUX_TC_PED_H #ifndef __LINUX_TC_PED_H
#define __LINUX_TC_PED_H #define __LINUX_TC_PED_H
#include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
#define TCA_ACT_PEDIT 7 #define TCA_ACT_PEDIT 7
......
#ifndef __LINUX_TC_EM_CMP_H #ifndef __LINUX_TC_EM_CMP_H
#define __LINUX_TC_EM_CMP_H #define __LINUX_TC_EM_CMP_H
#include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
struct tcf_em_cmp struct tcf_em_cmp
......
#ifndef __LINUX_TC_EM_META_H #ifndef __LINUX_TC_EM_META_H
#define __LINUX_TC_EM_META_H #define __LINUX_TC_EM_META_H
#include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
enum enum
......
#ifndef __LINUX_TC_EM_NBYTE_H #ifndef __LINUX_TC_EM_NBYTE_H
#define __LINUX_TC_EM_NBYTE_H #define __LINUX_TC_EM_NBYTE_H
#include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
struct tcf_em_nbyte struct tcf_em_nbyte
......
#ifndef __LINUX_TC_EM_TEXT_H #ifndef __LINUX_TC_EM_TEXT_H
#define __LINUX_TC_EM_TEXT_H #define __LINUX_TC_EM_TEXT_H
#include <linux/types.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
#define TC_EM_TEXT_ALGOSIZ 16 #define TC_EM_TEXT_ALGOSIZ 16
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#ifndef __LINUX_USB_CDC_H #ifndef __LINUX_USB_CDC_H
#define __LINUX_USB_CDC_H #define __LINUX_USB_CDC_H
#include <linux/types.h>
#define USB_CDC_SUBCLASS_ACM 0x02 #define USB_CDC_SUBCLASS_ACM 0x02
#define USB_CDC_SUBCLASS_ETHERNET 0x06 #define USB_CDC_SUBCLASS_ETHERNET 0x06
#define USB_CDC_SUBCLASS_WHCM 0x08 #define USB_CDC_SUBCLASS_WHCM 0x08
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#ifndef __LINUX_USB_GADGETFS_H #ifndef __LINUX_USB_GADGETFS_H
#define __LINUX_USB_GADGETFS_H #define __LINUX_USB_GADGETFS_H
#include <asm/types.h> #include <linux/types.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
......
#ifndef _LINUX_VIDEO_DECODER_H #ifndef _LINUX_VIDEO_DECODER_H
#define _LINUX_VIDEO_DECODER_H #define _LINUX_VIDEO_DECODER_H
#include <linux/types.h>
#define HAVE_VIDEO_DECODER 1 #define HAVE_VIDEO_DECODER 1
struct video_decoder_capability { /* this name is too long */ struct video_decoder_capability { /* this name is too long */
......
#ifndef _LINUX_VIDEO_ENCODER_H #ifndef _LINUX_VIDEO_ENCODER_H
#define _LINUX_VIDEO_ENCODER_H #define _LINUX_VIDEO_ENCODER_H
#include <linux/types.h>
struct video_encoder_capability { /* this name is too long */ struct video_encoder_capability { /* this name is too long */
__u32 flags; __u32 flags;
#define VIDEO_ENCODER_PAL 1 /* can encode PAL signal */ #define VIDEO_ENCODER_PAL 1 /* can encode PAL signal */
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#ifndef __LINUX_VIDEODEV_H #ifndef __LINUX_VIDEODEV_H
#define __LINUX_VIDEODEV_H #define __LINUX_VIDEODEV_H
#include <linux/types.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _LINUX_VIRTIO_BLK_H #define _LINUX_VIRTIO_BLK_H
/* This header is BSD licensed so anyone can use the definitions to implement /* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */ * compatible drivers/servers. */
#include <linux/types.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
/* The ID for virtio_block */ /* The ID for virtio_block */
......
#ifndef _LINUX_VIRTIO_CONSOLE_H #ifndef _LINUX_VIRTIO_CONSOLE_H
#define _LINUX_VIRTIO_CONSOLE_H #define _LINUX_VIRTIO_CONSOLE_H
#include <linux/types.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
/* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so
* anyone can use the definitions to implement compatible drivers/servers. */ * anyone can use the definitions to implement compatible drivers/servers. */
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _LINUX_VIRTIO_NET_H #define _LINUX_VIRTIO_NET_H
/* This header is BSD licensed so anyone can use the definitions to implement /* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */ * compatible drivers/servers. */
#include <linux/types.h>
#include <linux/virtio_config.h> #include <linux/virtio_config.h>
/* The ID for virtio_net */ /* The ID for virtio_net */
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef __MTD_INFTL_USER_H__ #ifndef __MTD_INFTL_USER_H__
#define __MTD_INFTL_USER_H__ #define __MTD_INFTL_USER_H__
#include <linux/types.h>
#define OSAK_VERSION 0x5120 #define OSAK_VERSION 0x5120
#define PERCENTUSED 98 #define PERCENTUSED 98
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <linux/types.h>
#define HDSP_MATRIX_MIXER_SIZE 2048 #define HDSP_MATRIX_MIXER_SIZE 2048
enum HDSP_IO_Type { enum HDSP_IO_Type {
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef _LINUX_SISFB_H_ #ifndef _LINUX_SISFB_H_
#define _LINUX_SISFB_H_ #define _LINUX_SISFB_H_
#include <linux/types.h>
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <asm/types.h>
/**********************************************/ /**********************************************/
/* PUBLIC */ /* PUBLIC */
......
#ifndef _UVESAFB_H #ifndef _UVESAFB_H
#define _UVESAFB_H #define _UVESAFB_H
#include <linux/types.h>
struct v86_regs { struct v86_regs {
__u32 ebx; __u32 ebx;
__u32 ecx; __u32 ecx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment