tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.infradead.org/hdrcleanup-2.6

Browse Source 
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
  [S390] __FD_foo definitions.
  Switch to __s32 types in joystick.h instead of C99 types for consistency.
  Add <sys/types.h> to headers included for userspace in <linux/input.h>
  Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
  Remove struct fddi_statistics from user view in <linux/if_fddi.h>
  Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
  Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
  Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
  Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
  Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
  Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
  Use __uXX types in <linux/divert.h> for struct divert_blk et al.
  Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
  Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
  Use __uXX types in user-visible structures in <linux/nbd.h>
  Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
  Use __uXX types for S390 DASD volume label definitions which are user-visible
  S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
  Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
  Fix private integer types used in V4L2 ioctls.
  ...

Manually resolve conflict in include/linux/mtd/physmap.h
This commit is contained in:
Linus Torvalds
2006-06-20 15:10:08 -07:00
parent 2edc322d42 9348f0de2d
commit cee4cca740
905 changed files with 839 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/acct.h
+1 -2
View File
@@ -16,7 +16,6 @@
#define _LINUX_ACCT_H
#include <linux/types.h>
#include <linux/jiffies.h>
#include <asm/param.h>
#include <asm/byteorder.h>
@@ -116,7 +115,6 @@ struct acct_v3
#ifdef __KERNEL__
#include <linux/config.h>
#ifdef CONFIG_BSD_PROCESS_ACCT
struct vfsmount;
@@ -165,6 +163,7 @@ typedef struct acct acct_t;
#endif /* __KERNEL */
#ifdef __KERNEL__
#include <linux/jiffies.h>
/*
* Yet another set of HZ to *HZ helper functions.
* See <linux/jiffies.h> for the original.
include/linux/acpi.h
-1
View File
@@ -25,7 +25,6 @@
#ifndef _LINUX_ACPI_H
#define _LINUX_ACPI_H
#include <linux/config.h>
#ifdef CONFIG_ACPI
include/linux/affs_hardblocks.h
+37 -35
View File
@@ -1,45 +1,47 @@
#ifndef AFFS_HARDBLOCKS_H
#define AFFS_HARDBLOCKS_H
#include <linux/types.h>
/* Just the needed definitions for the RDB of an Amiga HD. */
struct RigidDiskBlock {
u32 rdb_ID;
__u32 rdb_ID;
__be32 rdb_SummedLongs;
s32 rdb_ChkSum;
u32 rdb_HostID;
__s32 rdb_ChkSum;
__u32 rdb_HostID;
__be32 rdb_BlockBytes;
u32 rdb_Flags;
u32 rdb_BadBlockList;
__u32 rdb_Flags;
__u32 rdb_BadBlockList;
__be32 rdb_PartitionList;
u32 rdb_FileSysHeaderList;
u32 rdb_DriveInit;
u32 rdb_Reserved1[6];
u32 rdb_Cylinders;
u32 rdb_Sectors;
u32 rdb_Heads;
u32 rdb_Interleave;
u32 rdb_Park;
u32 rdb_Reserved2[3];
u32 rdb_WritePreComp;
u32 rdb_ReducedWrite;
u32 rdb_StepRate;
u32 rdb_Reserved3[5];
u32 rdb_RDBBlocksLo;
u32 rdb_RDBBlocksHi;
u32 rdb_LoCylinder;
u32 rdb_HiCylinder;
u32 rdb_CylBlocks;
u32 rdb_AutoParkSeconds;
u32 rdb_HighRDSKBlock;
u32 rdb_Reserved4;
__u32 rdb_FileSysHeaderList;
__u32 rdb_DriveInit;
__u32 rdb_Reserved1[6];
__u32 rdb_Cylinders;
__u32 rdb_Sectors;
__u32 rdb_Heads;
__u32 rdb_Interleave;
__u32 rdb_Park;
__u32 rdb_Reserved2[3];
__u32 rdb_WritePreComp;
__u32 rdb_ReducedWrite;
__u32 rdb_StepRate;
__u32 rdb_Reserved3[5];
__u32 rdb_RDBBlocksLo;
__u32 rdb_RDBBlocksHi;
__u32 rdb_LoCylinder;
__u32 rdb_HiCylinder;
__u32 rdb_CylBlocks;
__u32 rdb_AutoParkSeconds;
__u32 rdb_HighRDSKBlock;
__u32 rdb_Reserved4;
char rdb_DiskVendor[8];
char rdb_DiskProduct[16];
char rdb_DiskRevision[4];
char rdb_ControllerVendor[8];
char rdb_ControllerProduct[16];
char rdb_ControllerRevision[4];
u32 rdb_Reserved5[10];
__u32 rdb_Reserved5[10];
};
#define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */
@@ -47,16 +49,16 @@ struct RigidDiskBlock {
struct PartitionBlock {
__be32 pb_ID;
__be32 pb_SummedLongs;
s32 pb_ChkSum;
u32 pb_HostID;
__s32 pb_ChkSum;
__u32 pb_HostID;
__be32 pb_Next;
u32 pb_Flags;
u32 pb_Reserved1[2];
u32 pb_DevFlags;
u8 pb_DriveName[32];
u32 pb_Reserved2[15];
__u32 pb_Flags;
__u32 pb_Reserved1[2];
__u32 pb_DevFlags;
__u8 pb_DriveName[32];
__u32 pb_Reserved2[15];
__be32 pb_Environment[17];
u32 pb_EReserved[15];
__u32 pb_EReserved[15];
};
#define IDNAME_PARTITION 0x50415254 /* "PART" */
include/linux/agpgart.h
+1 -2
View File
@@ -27,8 +27,6 @@
#ifndef _AGP_H
#define _AGP_H 1
#include <linux/agp_backend.h>
#define AGPIOC_BASE 'A'
#define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*)
#define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1)
@@ -112,6 +110,7 @@ typedef struct _agp_unbind {
#else /* __KERNEL__ */
#include <linux/mutex.h>
#include <linux/agp_backend.h>
#define AGPGART_MINOR 175
include/linux/amba/clcd.h
-1
View File
@@ -9,7 +9,6 @@
* License. See the file COPYING in the main directory of this archive
* for more details.
*/
#include <linux/config.h>
#include <linux/fb.h>
/*
include/linux/atmdev.h
-1
View File
@@ -209,7 +209,6 @@ struct atm_cirange {
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/wait.h> /* wait_queue_head_t */
#include <linux/time.h> /* struct timeval */
#include <linux/net.h>
include/linux/audit.h
+2 -2
View File
@@ -24,8 +24,7 @@
#ifndef _LINUX_AUDIT_H_
#define _LINUX_AUDIT_H_
#include <linux/sched.h>
#include <linux/elf.h>
#include <linux/elf-em.h>
/* The netlink messages for the audit system is divided into blocks:
* 1000 - 1099 are for commanding the audit system
@@ -273,6 +272,7 @@ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
};
#ifdef __KERNEL__
#include <linux/sched.h>
struct audit_sig_info {
uid_t uid;
include/linux/blkdev.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_BLKDEV_H
#define _LINUX_BLKDEV_H
#include <linux/config.h>
#include <linux/major.h>
#include <linux/genhd.h>
#include <linux/list.h>
include/linux/blkpg.h
+1
View File
@@ -24,6 +24,7 @@
*
* For today, only the partition stuff - aeb, 990515
*/
#include <linux/compiler.h>
#include <linux/ioctl.h>
#define BLKPG _IO(0x12,105)
include/linux/blktrace_api.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef BLKTRACE_H
#define BLKTRACE_H
#include <linux/config.h>
#include <linux/blkdev.h>
#include <linux/relay.h>
include/linux/blockgroup_lock.h
-1
View File
@@ -6,7 +6,6 @@
* Simple hashed spinlocking.
*/
#include <linux/config.h>
#include <linux/spinlock.h>
#include <linux/cache.h>
include/linux/cache.h
-1
View File
@@ -2,7 +2,6 @@
#define __LINUX_CACHE_H
#include <linux/kernel.h>
#include <linux/config.h>
#include <asm/cache.h>
#ifndef L1_CACHE_ALIGN
include/linux/coda.h
-1
View File
@@ -59,7 +59,6 @@ Mellon the rights to redistribute these changes without encumbrance.
#ifndef _CODA_HEADER_
#define _CODA_HEADER_
#include <linux/config.h>
/* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */
#if defined(__NetBSD__) || \
include/linux/compat.h
-1
View File
@@ -4,7 +4,6 @@
* These are the type definitions for the architecture specific
* syscall compatibility layer.
*/
#include <linux/config.h>
#ifdef CONFIG_COMPAT
include/linux/compiler.h
+11 -8
View File
@@ -78,6 +78,7 @@ extern void __chk_io_ptr(void __iomem *);
#endif /* __ASSEMBLY__ */
#ifdef __KERNEL__
/*
* Allow us to mark functions as 'deprecated' and have gcc emit a nice
* warning for each use, in hopes of speeding the functions removal.
@@ -127,6 +128,16 @@ extern void __chk_io_ptr(void __iomem *);
# define __attribute_pure__ /* unimplemented */
#endif
#ifndef noinline
#define noinline
#endif
#ifndef __always_inline
#define __always_inline inline
#endif
#endif /* __KERNEL__ */
/*
* From the GCC manual:
*
@@ -145,12 +156,4 @@ extern void __chk_io_ptr(void __iomem *);
# define __attribute_const__ /* unimplemented */
#endif
#ifndef noinline
#define noinline
#endif
#ifndef __always_inline
#define __always_inline inline
#endif
#endif /* __LINUX_COMPILER_H */
include/linux/cpufreq.h
-1
View File
@@ -15,7 +15,6 @@
#define _LINUX_CPUFREQ_H
#include <linux/mutex.h>
#include <linux/config.h>
#include <linux/notifier.h>
#include <linux/threads.h>
#include <linux/device.h>
include/linux/cramfs_fs.h
+14 -20
View File
@@ -1,13 +1,7 @@
#ifndef __CRAMFS_H
#define __CRAMFS_H
#ifndef __KERNEL__
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
#endif
#include <linux/types.h>
#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
#define CRAMFS_SIGNATURE "Compressed ROMFS"
@@ -33,9 +27,9 @@ typedef unsigned int u32;
* Reasonably terse representation of the inode data.
*/
struct cramfs_inode {
u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
__u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH;
/* SIZE for device files is i_rdev */
u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
__u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH;
/* NAMELEN is the length of the file name, divided by 4 and
rounded up. (cramfs doesn't support hard links.) */
/* OFFSET: For symlinks and non-empty regular files, this
@@ -44,27 +38,27 @@ struct cramfs_inode {
see README). For non-empty directories it is the offset
(divided by 4) of the inode of the first file in that
directory. For anything else, offset is zero. */
u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
__u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH;
};
struct cramfs_info {
u32 crc;
u32 edition;
u32 blocks;
u32 files;
__u32 crc;
__u32 edition;
__u32 blocks;
__u32 files;
};
/*
* Superblock information at the beginning of the FS.
*/
struct cramfs_super {
u32 magic; /* 0x28cd3d45 - random number */
u32 size; /* length in bytes */
u32 flags; /* feature flags */
u32 future; /* reserved for future use */
u8 signature[16]; /* "Compressed ROMFS" */
__u32 magic; /* 0x28cd3d45 - random number */
__u32 size; /* length in bytes */
__u32 flags; /* feature flags */
__u32 future; /* reserved for future use */
__u8 signature[16]; /* "Compressed ROMFS" */
struct cramfs_info fsid; /* unique filesystem info */
u8 name[16]; /* user-defined name */
__u8 name[16]; /* user-defined name */
struct cramfs_inode root; /* root inode data */
};
include/linux/crypto.h
-1
View File
@@ -17,7 +17,6 @@
#ifndef _LINUX_CRYPTO_H
#define _LINUX_CRYPTO_H
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
include/linux/cyclomx.h
-1
View File
@@ -24,7 +24,6 @@
* 1998/08/08 acme Version 0.0.1
*/
#include <linux/config.h>
#include <linux/wanrouter.h>
#include <linux/spinlock.h>
include/linux/dcookies.h
-1
View File
@@ -9,7 +9,6 @@
#ifndef DCOOKIES_H
#define DCOOKIES_H
#include <linux/config.h>
#ifdef CONFIG_PROFILING
include/linux/devfs_fs_kernel.h
-1
View File
@@ -2,7 +2,6 @@
#define _LINUX_DEVFS_FS_KERNEL_H
#include <linux/fs.h>
#include <linux/config.h>
#include <linux/spinlock.h>
#include <linux/types.h>
include/linux/device.h
-1
View File
@@ -11,7 +11,6 @@
#ifndef _DEVICE_H_
#define _DEVICE_H_
#include <linux/config.h>
#include <linux/ioport.h>
#include <linux/kobject.h>
#include <linux/klist.h>
include/linux/divert.h
+10 -10
View File
@@ -27,10 +27,10 @@ struct divert_blk
{
int divert; /* are we active */
unsigned int protos; /* protocols */
u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
__u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
__u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
__u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
__u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
};
/*
@@ -40,12 +40,12 @@ struct divert_blk
typedef union _divert_cf_arg
{
s16 int16;
u16 uint16;
s32 int32;
u32 uint32;
s64 int64;
u64 uint64;
__s16 int16;
__u16 uint16;
__s32 int32;
__u32 uint32;
__s64 int64;
__u64 uint64;
void __user *ptr;
} divert_cf_arg;
include/linux/dmi.h
-1
View File
@@ -2,7 +2,6 @@
#define __DMI_H__
#include <linux/list.h>
#include <linux/config.h>
enum dmi_field {
DMI_NONE,
include/linux/dnotify.h
-1
View File
@@ -18,7 +18,6 @@ struct dnotify_struct {
#ifdef __KERNEL__
#include <linux/config.h>
#ifdef CONFIG_DNOTIFY
include/linux/elf-em.h
+44
View File
@@ -0,0 +1,44 @@
#ifndef _LINUX_ELF_EM_H
#define _LINUX_ELF_EM_H
/* These constants define the various ELF target machines */
#define EM_NONE 0
#define EM_M32 1
#define EM_SPARC 2
#define EM_386 3
#define EM_68K 4
#define EM_88K 5
#define EM_486 6 /* Perhaps disused */
#define EM_860 7
#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */
#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
#define EM_PARISC 15 /* HPPA */
#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
#define EM_PPC 20 /* PowerPC */
#define EM_PPC64 21 /* PowerPC64 */
#define EM_SH 42 /* SuperH */
#define EM_SPARCV9 43 /* SPARC v9 64-bit */
#define EM_IA_64 50 /* HP/Intel IA-64 */
#define EM_X86_64 62 /* AMD x86-64 */
#define EM_S390 22 /* IBM S/390 */
#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
#define EM_V850 87 /* NEC v850 */
#define EM_M32R 88 /* Renesas M32R */
#define EM_H8_300 46 /* Renesas H8/300,300H,H8S */
#define EM_FRV 0x5441 /* Fujitsu FR-V */
/*
* This is an interim value that we will use until the committee comes
* up with a final number.
*/
#define EM_ALPHA 0x9026
/* Bogus old v850 magic number, used by old tools. */
#define EM_CYGNUS_V850 0x9080
/* Bogus old m32r magic number, used by old tools. */
#define EM_CYGNUS_M32R 0x9041
/* This is the old interim value for S/390 architecture */
#define EM_S390_OLD 0xA390
#endif /* _LINUX_ELF_EM_H */
include/linux/elf.h
+1 -58
View File
@@ -3,6 +3,7 @@
#include <linux/types.h>
#include <linux/auxvec.h>
#include <linux/elf-em.h>
#include <asm/elf.h>
#ifndef elf_read_implies_exec
@@ -55,64 +56,6 @@ typedef __s64 Elf64_Sxword;
#define ET_LOPROC 0xff00
#define ET_HIPROC 0xffff
/* These constants define the various ELF target machines */
#define EM_NONE 0
#define EM_M32 1
#define EM_SPARC 2
#define EM_386 3
#define EM_68K 4
#define EM_88K 5
#define EM_486 6 /* Perhaps disused */
#define EM_860 7
#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */
#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
#define EM_PARISC 15 /* HPPA */
#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
#define EM_PPC 20 /* PowerPC */
#define EM_PPC64 21 /* PowerPC64 */
#define EM_SH 42 /* SuperH */
#define EM_SPARCV9 43 /* SPARC v9 64-bit */
#define EM_IA_64 50 /* HP/Intel IA-64 */
#define EM_X86_64 62 /* AMD x86-64 */
#define EM_S390 22 /* IBM S/390 */
#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
#define EM_V850 87 /* NEC v850 */
#define EM_M32R 88 /* Renesas M32R */
#define EM_H8_300 46 /* Renesas H8/300,300H,H8S */
/*
* This is an interim value that we will use until the committee comes
* up with a final number.
*/
#define EM_ALPHA 0x9026
/* Bogus old v850 magic number, used by old tools. */
#define EM_CYGNUS_V850 0x9080
/* Bogus old m32r magic number, used by old tools. */
#define EM_CYGNUS_M32R 0x9041
/*
* This is the old interim value for S/390 architecture
*/
#define EM_S390_OLD 0xA390
#define EM_FRV 0x5441 /* Fujitsu FR-V */
/* This is the info that is needed to parse the dynamic section of the file */
#define DT_NULL 0
#define DT_NEEDED 1
include/linux/errqueue.h
-1
View File
@@ -21,7 +21,6 @@ struct sock_extended_err
#ifdef __KERNEL__
#include <linux/config.h>
#include <net/ip.h>
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
#include <linux/ipv6.h>
include/linux/ethtool.h
+86 -83
View File
@@ -15,24 +15,24 @@
/* This should work for both 32 and 64 bit userland. */
struct ethtool_cmd {
u32 cmd;
u32 supported; /* Features this interface supports */
u32 advertising; /* Features this interface advertises */
u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
u8 duplex; /* Duplex, half or full */
u8 port; /* Which connector port */
u8 phy_address;
u8 transceiver; /* Which transceiver to use */
u8 autoneg; /* Enable or disable autonegotiation */
u32 maxtxpkt; /* Tx pkts before generating tx int */
u32 maxrxpkt; /* Rx pkts before generating rx int */
u32 reserved[4];
__u32 cmd;
__u32 supported; /* Features this interface supports */
__u32 advertising; /* Features this interface advertises */
__u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */
__u8 duplex; /* Duplex, half or full */
__u8 port; /* Which connector port */
__u8 phy_address;
__u8 transceiver; /* Which transceiver to use */
__u8 autoneg; /* Enable or disable autonegotiation */
__u32 maxtxpkt; /* Tx pkts before generating tx int */
__u32 maxrxpkt; /* Rx pkts before generating rx int */
__u32 reserved[4];
};
#define ETHTOOL_BUSINFO_LEN 32
/* these strings are set to whatever the driver author decides... */
struct ethtool_drvinfo {
u32 cmd;
__u32 cmd;
char driver[32]; /* driver short name, "tulip", "eepro100" */
char version[32]; /* driver version string */
char fw_version[32]; /* firmware version string, if applicable */
@@ -40,53 +40,53 @@ struct ethtool_drvinfo {
/* For PCI devices, use pci_name(pci_dev). */
char reserved1[32];
char reserved2[16];
u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */
u32 testinfo_len;
u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
__u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */
__u32 testinfo_len;
__u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */
__u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
};
#define SOPASS_MAX 6
/* wake-on-lan settings */
struct ethtool_wolinfo {
u32 cmd;
u32 supported;
u32 wolopts;
u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */
__u32 cmd;
__u32 supported;
__u32 wolopts;
__u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */
};
/* for passing single values */
struct ethtool_value {
u32 cmd;
u32 data;
__u32 cmd;
__u32 data;
};
/* for passing big chunks of data */
struct ethtool_regs {
u32 cmd;
u32 version; /* driver-specific, indicates different chips/revs */
u32 len; /* bytes */
u8 data[0];
__u32 cmd;
__u32 version; /* driver-specific, indicates different chips/revs */
__u32 len; /* bytes */
__u8 data[0];
};
/* for passing EEPROM chunks */
struct ethtool_eeprom {
u32 cmd;
u32 magic;
u32 offset; /* in bytes */
u32 len; /* in bytes */
u8 data[0];
__u32 cmd;
__u32 magic;
__u32 offset; /* in bytes */
__u32 len; /* in bytes */
__u8 data[0];
};
/* for configuring coalescing parameters of chip */
struct ethtool_coalesce {
u32 cmd; /* ETHTOOL_{G,S}COALESCE */
__u32 cmd; /* ETHTOOL_{G,S}COALESCE */
/* How many usecs to delay an RX interrupt after
* a packet arrives. If 0, only rx_max_coalesced_frames
* is used.
*/
u32 rx_coalesce_usecs;
__u32 rx_coalesce_usecs;
/* How many packets to delay an RX interrupt after
* a packet arrives. If 0, only rx_coalesce_usecs is
@@ -94,21 +94,21 @@ struct ethtool_coalesce {
* to zero as this would cause RX interrupts to never be
* generated.
*/
u32 rx_max_coalesced_frames;
__u32 rx_max_coalesced_frames;
/* Same as above two parameters, except that these values
* apply while an IRQ is being serviced by the host. Not
* all cards support this feature and the values are ignored
* in that case.
*/
u32 rx_coalesce_usecs_irq;
u32 rx_max_coalesced_frames_irq;
__u32 rx_coalesce_usecs_irq;
__u32 rx_max_coalesced_frames_irq;
/* How many usecs to delay a TX interrupt after
* a packet is sent. If 0, only tx_max_coalesced_frames
* is used.
*/
u32 tx_coalesce_usecs;
__u32 tx_coalesce_usecs;
/* How many packets to delay a TX interrupt after
* a packet is sent. If 0, only tx_coalesce_usecs is
@@ -116,22 +116,22 @@ struct ethtool_coalesce {
* to zero as this would cause TX interrupts to never be
* generated.
*/
u32 tx_max_coalesced_frames;
__u32 tx_max_coalesced_frames;
/* Same as above two parameters, except that these values
* apply while an IRQ is being serviced by the host. Not
* all cards support this feature and the values are ignored
* in that case.
*/
u32 tx_coalesce_usecs_irq;
u32 tx_max_coalesced_frames_irq;
__u32 tx_coalesce_usecs_irq;
__u32 tx_max_coalesced_frames_irq;
/* How many usecs to delay in-memory statistics
* block updates. Some drivers do not have an in-memory
* statistic block, and in such cases this value is ignored.
* This value must not be zero.
*/
u32 stats_block_coalesce_usecs;
__u32 stats_block_coalesce_usecs;
/* Adaptive RX/TX coalescing is an algorithm implemented by
* some drivers to improve latency under low packet rates and
@@ -140,18 +140,18 @@ struct ethtool_coalesce {
* not implemented by the driver causes these values to be
* silently ignored.
*/
u32 use_adaptive_rx_coalesce;
u32 use_adaptive_tx_coalesce;
__u32 use_adaptive_rx_coalesce;
__u32 use_adaptive_tx_coalesce;
/* When the packet rate (measured in packets per second)
* is below pkt_rate_low, the {rx,tx}_*_low parameters are
* used.
*/
u32 pkt_rate_low;
u32 rx_coalesce_usecs_low;
u32 rx_max_coalesced_frames_low;
u32 tx_coalesce_usecs_low;
u32 tx_max_coalesced_frames_low;
__u32 pkt_rate_low;
__u32 rx_coalesce_usecs_low;
__u32 rx_max_coalesced_frames_low;
__u32 tx_coalesce_usecs_low;
__u32 tx_max_coalesced_frames_low;
/* When the packet rate is below pkt_rate_high but above
* pkt_rate_low (both measured in packets per second) the
@@ -162,43 +162,43 @@ struct ethtool_coalesce {
* is above pkt_rate_high, the {rx,tx}_*_high parameters are
* used.
*/
u32 pkt_rate_high;
u32 rx_coalesce_usecs_high;
u32 rx_max_coalesced_frames_high;
u32 tx_coalesce_usecs_high;
u32 tx_max_coalesced_frames_high;
__u32 pkt_rate_high;
__u32 rx_coalesce_usecs_high;
__u32 rx_max_coalesced_frames_high;
__u32 tx_coalesce_usecs_high;
__u32 tx_max_coalesced_frames_high;
/* How often to do adaptive coalescing packet rate sampling,
* measured in seconds. Must not be zero.
*/
u32 rate_sample_interval;
__u32 rate_sample_interval;
};
/* for configuring RX/TX ring parameters */
struct ethtool_ringparam {
u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */
__u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */
/* Read only attributes. These indicate the maximum number
* of pending RX/TX ring entries the driver will allow the
* user to set.
*/
u32 rx_max_pending;
u32 rx_mini_max_pending;
u32 rx_jumbo_max_pending;
u32 tx_max_pending;
__u32 rx_max_pending;
__u32 rx_mini_max_pending;
__u32 rx_jumbo_max_pending;
__u32 tx_max_pending;
/* Values changeable by the user. The valid values are
* in the range 1 to the "*_max_pending" counterpart above.
*/
u32 rx_pending;
u32 rx_mini_pending;
u32 rx_jumbo_pending;
u32 tx_pending;
__u32 rx_pending;
__u32 rx_mini_pending;
__u32 rx_jumbo_pending;
__u32 tx_pending;
};
/* for configuring link flow control parameters */
struct ethtool_pauseparam {
u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */
__u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */
/* If the link is being auto-negotiated (via ethtool_cmd.autoneg
* being true) the user may set 'autonet' here non-zero to have the
@@ -210,9 +210,9 @@ struct ethtool_pauseparam {
* then {rx,tx}_pause force the driver to use/not-use pause
* flow control.
*/
u32 autoneg;
u32 rx_pause;
u32 tx_pause;
__u32 autoneg;
__u32 rx_pause;
__u32 tx_pause;
};
#define ETH_GSTRING_LEN 32
@@ -223,10 +223,10 @@ enum ethtool_stringset {
/* for passing string sets for data tagging */
struct ethtool_gstrings {
u32 cmd; /* ETHTOOL_GSTRINGS */
u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/
u32 len; /* number of strings in the string set */
u8 data[0];
__u32 cmd; /* ETHTOOL_GSTRINGS */
__u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/
__u32 len; /* number of strings in the string set */
__u8 data[0];
};
enum ethtool_test_flags {
@@ -236,26 +236,28 @@ enum ethtool_test_flags {
/* for requesting NIC test and getting results*/
struct ethtool_test {
u32 cmd; /* ETHTOOL_TEST */
u32 flags; /* ETH_TEST_FL_xxx */
u32 reserved;
u32 len; /* result length, in number of u64 elements */
u64 data[0];
__u32 cmd; /* ETHTOOL_TEST */
__u32 flags; /* ETH_TEST_FL_xxx */
__u32 reserved;
__u32 len; /* result length, in number of u64 elements */
__u64 data[0];
};
/* for dumping NIC-specific statistics */
struct ethtool_stats {
u32 cmd; /* ETHTOOL_GSTATS */
u32 n_stats; /* number of u64's being returned */
u64 data[0];
__u32 cmd; /* ETHTOOL_GSTATS */
__u32 n_stats; /* number of u64's being returned */
__u64 data[0];
};
struct ethtool_perm_addr {
u32 cmd; /* ETHTOOL_GPERMADDR */
u32 size;
u8 data[0];
__u32 cmd; /* ETHTOOL_GPERMADDR */
__u32 size;
__u8 data[0];
};
#ifdef __KERNEL__
struct net_device;
/* Some generic methods drivers may use in their ethtool_ops */
@@ -371,6 +373,7 @@ struct ethtool_ops {
u32 (*get_ufo)(struct net_device *);
int (*set_ufo)(struct net_device *, u32);
};
#endif /* __KERNEL__ */
/* CMDs currently supported */
#define ETHTOOL_GSET 0x00000001 /* Get settings. */
include/linux/ext2_fs.h
+1 -1
View File
@@ -17,7 +17,6 @@
#define _LINUX_EXT2_FS_H
#include <linux/types.h>
#include <linux/ext2_fs_sb.h>
/*
* The second extended filesystem constants/structures
@@ -70,6 +69,7 @@
#define EXT2_SUPER_MAGIC 0xEF53
#ifdef __KERNEL__
#include <linux/ext2_fs_sb.h>
static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
{
return sb->s_fs_info;
include/linux/ext3_fs.h
+4 -6
View File
@@ -17,11 +17,6 @@
#define _LINUX_EXT3_FS_H
#include <linux/types.h>
#include <linux/ext3_fs_i.h>
#include <linux/ext3_fs_sb.h>
struct statfs;
/*
* The second extended filesystem constants/structures
@@ -487,6 +482,8 @@ struct ext3_super_block {
};
#ifdef __KERNEL__
#include <linux/ext3_fs_i.h>
#include <linux/ext3_fs_sb.h>
static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb)
{
return sb->s_fs_info;
@@ -664,6 +661,8 @@ struct ext3_dir_entry_2 {
#define DX_HASH_HALF_MD4 1
#define DX_HASH_TEA 2
#ifdef __KERNEL__
/* hash info structure used by the directory hash */
struct dx_hash_info
{
@@ -675,7 +674,6 @@ struct dx_hash_info
#define EXT3_HTREE_EOF 0x7fffffff
#ifdef __KERNEL__
/*
* Control parameters used by ext3_htree_next_block
*/
include/linux/fs.h
-1
View File
@@ -6,7 +6,6 @@
* structures etc.
*/
#include <linux/config.h>
#include <linux/limits.h>
#include <linux/ioctl.h>
include/linux/ftape.h
-1
View File
@@ -35,7 +35,6 @@
#include <linux/mm.h>
#endif
#include <linux/types.h>
#include <linux/config.h>
#include <linux/mtio.h>
#define FT_SECTOR(x) (x+1) /* sector offset into real sector */
include/linux/gameport.h
+6
View File
@@ -9,6 +9,7 @@
* the Free Software Foundation.
*/
#ifdef __KERNEL__
#include <asm/io.h>
#include <linux/list.h>
#include <linux/mutex.h>
@@ -154,6 +155,8 @@ static inline void gameport_register_driver(struct gameport_driver *drv)
void gameport_unregister_driver(struct gameport_driver *drv);
#endif /* __KERNEL__ */
#define GAMEPORT_MODE_DISABLED 0
#define GAMEPORT_MODE_RAW 1
#define GAMEPORT_MODE_COOKED 2
@@ -169,6 +172,8 @@ void gameport_unregister_driver(struct gameport_driver *drv);
#define GAMEPORT_ID_VENDOR_GRAVIS 0x0009
#define GAMEPORT_ID_VENDOR_GUILLEMOT 0x000a
#ifdef __KERNEL__
static inline void gameport_trigger(struct gameport *gameport)
{
if (gameport->trigger)
@@ -219,4 +224,5 @@ static inline void gameport_set_poll_interval(struct gameport *gameport, unsigne
void gameport_start_polling(struct gameport *gameport);
void gameport_stop_polling(struct gameport *gameport);
#endif /* __KERNEL__ */
#endif
include/linux/generic_serial.h
+4 -2
View File
@@ -12,6 +12,7 @@
#ifndef GENERIC_SERIAL_H
#define GENERIC_SERIAL_H
#ifdef __KERNEL__
#include <linux/mutex.h>
struct real_driver {
@@ -54,6 +55,7 @@ struct gs_port {
spinlock_t driver_lock;
};
#endif /* __KERNEL__ */
/* Flags */
/* Warning: serial.h defines some ASYNC_ flags, they say they are "only"
@@ -75,7 +77,7 @@ struct gs_port {
#define GS_DEBUG_FLOW 0x00000020
#define GS_DEBUG_WRITE 0x00000040
#ifdef __KERNEL__
void gs_put_char(struct tty_struct *tty, unsigned char ch);
int gs_write(struct tty_struct *tty,
const unsigned char *buf, int count);
@@ -94,5 +96,5 @@ int gs_init_port(struct gs_port *port);
int gs_setserial(struct gs_port *port, struct serial_struct __user *sp);
int gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
void gs_got_break(struct gs_port *port);
#endif /* __KERNEL__ */
#endif
include/linux/genhd.h
+6 -6
View File
@@ -9,13 +9,7 @@
* <drew@colorado.edu>
*/
#include <linux/config.h>
#include <linux/types.h>
#include <linux/major.h>
#include <linux/device.h>
#include <linux/smp.h>
#include <linux/string.h>
#include <linux/fs.h>
enum {
/* These three have identical behaviour; use the second one if DOS FDISK gets
@@ -61,6 +55,12 @@ struct partition {
#endif
#ifdef __KERNEL__
#include <linux/major.h>
#include <linux/device.h>
#include <linux/smp.h>
#include <linux/string.h>
#include <linux/fs.h>
struct partition {
unsigned char boot_ind; /* 0x80 - active */
unsigned char head; /* starting head */
include/linux/gfp.h
-1
View File
@@ -4,7 +4,6 @@
#include <linux/mmzone.h>
#include <linux/stddef.h>
#include <linux/linkage.h>
#include <linux/config.h>
struct vm_area_struct;
include/linux/hardirq.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef LINUX_HARDIRQ_H
#define LINUX_HARDIRQ_H
#include <linux/config.h>
#include <linux/preempt.h>
#include <linux/smp_lock.h>
#include <asm/hardirq.h>
include/linux/highmem.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_HIGHMEM_H
#define _LINUX_HIGHMEM_H
#include <linux/config.h>
#include <linux/fs.h>
#include <linux/mm.h>
include/linux/highuid.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_HIGHUID_H
#define _LINUX_HIGHUID_H
#include <linux/config.h>
#include <linux/types.h>
/*
include/linux/i2c-algo-ite.h
+5 -2
View File
@@ -29,7 +29,7 @@
#ifndef I2C_ALGO_ITE_H
#define I2C_ALGO_ITE_H 1
#include <linux/i2c.h>
#include <linux/types.h>
/* Example of a sequential read request:
struct i2c_iic_msg s_msg;
@@ -49,6 +49,9 @@ struct i2c_iic_msg {
char *buf; /* pointer to msg data */
};
#ifdef __KERNEL__
struct i2c_adapter;
struct i2c_algo_iic_data {
void *data; /* private data for lolevel routines */
void (*setiic) (void *data, int ctl, int val);
@@ -65,5 +68,5 @@ struct i2c_algo_iic_data {
int i2c_iic_add_bus(struct i2c_adapter *);
int i2c_iic_del_bus(struct i2c_adapter *);
#endif /* __KERNEL__ */
#endif /* I2C_ALGO_ITE_H */
include/linux/i2c.h
+6 -3
View File
@@ -20,14 +20,15 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* ------------------------------------------------------------------------- */
/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
Frodo Looijaard <frodol@dds.nl> */
#ifndef _LINUX_I2C_H
#define _LINUX_I2C_H
#include <linux/module.h>
#include <linux/types.h>
#ifdef __KERNEL__
#include <linux/module.h>
#include <linux/i2c-id.h>
#include <linux/mod_devicetable.h>
#include <linux/device.h> /* for struct device */
@@ -354,6 +355,7 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap)
{
return adap->nr;
}
#endif /* __KERNEL__ */
/*
* I2C Message - used for pure i2c transaction, also from /dev interface
@@ -469,6 +471,7 @@ union i2c_smbus_data {
#define I2C_SMBUS 0x0720 /* SMBus-level access */
/* ----- I2C-DEV: char device interface stuff ------------------------- */
#ifdef __KERNEL__
#define I2C_MAJOR 89 /* Device major number */
@@ -646,5 +649,5 @@ static unsigned short *forces[] = { force, force_##chip1, \
force_##chip6, force_##chip7, \
force_##chip8, NULL }; \
I2C_CLIENT_INSMOD_COMMON
#endif /* __KERNEL__ */
#endif /* _LINUX_I2C_H */
include/linux/i2o-dev.h
+80 -87
View File
@@ -13,7 +13,7 @@
* This header file defines the I2O APIs that are available to both
* the kernel and user level applications. Kernel specific structures
* are defined in i2o_osm. OSMs should include _only_ i2o_osm.h which
* automatically includs this file.
* automatically includes this file.
*
*/
@@ -23,14 +23,7 @@
/* How many controllers are we allowing */
#define MAX_I2O_CONTROLLERS 32
//#include <linux/ioctl.h>
#ifndef __KERNEL__
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
#endif /* __KERNEL__ */
#include <linux/ioctl.h>
/*
* I2O Control IOCTLs and structures
@@ -53,7 +46,7 @@ typedef unsigned int u32;
struct i2o_cmd_passthru32 {
unsigned int iop; /* IOP unit number */
u32 msg; /* message */
__u32 msg; /* message */
};
struct i2o_cmd_passthru {
@@ -138,53 +131,53 @@ typedef struct i2o_sg_io_hdr {
#define I2O_BUS_UNKNOWN 0x80
typedef struct _i2o_pci_bus {
u8 PciFunctionNumber;
u8 PciDeviceNumber;
u8 PciBusNumber;
u8 reserved;
u16 PciVendorID;
u16 PciDeviceID;
__u8 PciFunctionNumber;
__u8 PciDeviceNumber;
__u8 PciBusNumber;
__u8 reserved;
__u16 PciVendorID;
__u16 PciDeviceID;
} i2o_pci_bus;
typedef struct _i2o_local_bus {
u16 LbBaseIOPort;
u16 reserved;
u32 LbBaseMemoryAddress;
__u16 LbBaseIOPort;
__u16 reserved;
__u32 LbBaseMemoryAddress;
} i2o_local_bus;
typedef struct _i2o_isa_bus {
u16 IsaBaseIOPort;
u8 CSN;
u8 reserved;
u32 IsaBaseMemoryAddress;
__u16 IsaBaseIOPort;
__u8 CSN;
__u8 reserved;
__u32 IsaBaseMemoryAddress;
} i2o_isa_bus;
typedef struct _i2o_eisa_bus_info {
u16 EisaBaseIOPort;
u8 reserved;
u8 EisaSlotNumber;
u32 EisaBaseMemoryAddress;
__u16 EisaBaseIOPort;
__u8 reserved;
__u8 EisaSlotNumber;
__u32 EisaBaseMemoryAddress;
} i2o_eisa_bus;
typedef struct _i2o_mca_bus {
u16 McaBaseIOPort;
u8 reserved;
u8 McaSlotNumber;
u32 McaBaseMemoryAddress;
__u16 McaBaseIOPort;
__u8 reserved;
__u8 McaSlotNumber;
__u32 McaBaseMemoryAddress;
} i2o_mca_bus;
typedef struct _i2o_other_bus {
u16 BaseIOPort;
u16 reserved;
u32 BaseMemoryAddress;
__u16 BaseIOPort;
__u16 reserved;
__u32 BaseMemoryAddress;
} i2o_other_bus;
typedef struct _i2o_hrt_entry {
u32 adapter_id;
u32 parent_tid:12;
u32 state:4;
u32 bus_num:8;
u32 bus_type:8;
__u32 adapter_id;
__u32 parent_tid:12;
__u32 state:4;
__u32 bus_num:8;
__u32 bus_type:8;
union {
i2o_pci_bus pci_bus;
i2o_local_bus local_bus;
@@ -196,66 +189,66 @@ typedef struct _i2o_hrt_entry {
} i2o_hrt_entry;
typedef struct _i2o_hrt {
u16 num_entries;
u8 entry_len;
u8 hrt_version;
u32 change_ind;
__u16 num_entries;
__u8 entry_len;
__u8 hrt_version;
__u32 change_ind;
i2o_hrt_entry hrt_entry[1];
} i2o_hrt;
typedef struct _i2o_lct_entry {
u32 entry_size:16;
u32 tid:12;
u32 reserved:4;
u32 change_ind;
u32 device_flags;
u32 class_id:12;
u32 version:4;
u32 vendor_id:16;
u32 sub_class;
u32 user_tid:12;
u32 parent_tid:12;
u32 bios_info:8;
u8 identity_tag[8];
u32 event_capabilities;
__u32 entry_size:16;
__u32 tid:12;
__u32 reserved:4;
__u32 change_ind;
__u32 device_flags;
__u32 class_id:12;
__u32 version:4;
__u32 vendor_id:16;
__u32 sub_class;
__u32 user_tid:12;
__u32 parent_tid:12;
__u32 bios_info:8;
__u8 identity_tag[8];
__u32 event_capabilities;
} i2o_lct_entry;
typedef struct _i2o_lct {
u32 table_size:16;
u32 boot_tid:12;
u32 lct_ver:4;
u32 iop_flags;
u32 change_ind;
__u32 table_size:16;
__u32 boot_tid:12;
__u32 lct_ver:4;
__u32 iop_flags;
__u32 change_ind;
i2o_lct_entry lct_entry[1];
} i2o_lct;
typedef struct _i2o_status_block {
u16 org_id;
u16 reserved;
u16 iop_id:12;
u16 reserved1:4;
u16 host_unit_id;
u16 segment_number:12;
u16 i2o_version:4;
u8 iop_state;
u8 msg_type;
u16 inbound_frame_size;
u8 init_code;
u8 reserved2;
u32 max_inbound_frames;
u32 cur_inbound_frames;
u32 max_outbound_frames;
__u16 org_id;
__u16 reserved;
__u16 iop_id:12;
__u16 reserved1:4;
__u16 host_unit_id;
__u16 segment_number:12;
__u16 i2o_version:4;
__u8 iop_state;
__u8 msg_type;
__u16 inbound_frame_size;
__u8 init_code;
__u8 reserved2;
__u32 max_inbound_frames;
__u32 cur_inbound_frames;
__u32 max_outbound_frames;
char product_id[24];
u32 expected_lct_size;
u32 iop_capabilities;
u32 desired_mem_size;
u32 current_mem_size;
u32 current_mem_base;
u32 desired_io_size;
u32 current_io_size;
u32 current_io_base;
u32 reserved3:24;
u32 cmd_status:8;
__u32 expected_lct_size;
__u32 iop_capabilities;
__u32 desired_mem_size;
__u32 current_mem_size;
__u32 current_mem_base;
__u32 desired_io_size;
__u32 current_io_size;
__u32 current_io_base;
__u32 reserved3:24;
__u32 cmd_status:8;
} i2o_status_block;
/* Event indicator mask flags */
include/linux/ide.h
-1
View File
@@ -6,7 +6,6 @@
* Copyright (C) 1994-2002 Linus Torvalds & authors
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/hdreg.h>
include/linux/if_fddi.h
+2
View File
@@ -102,6 +102,7 @@ struct fddihdr
} hdr;
} __attribute__ ((packed));
#ifdef __KERNEL__
/* Define FDDI statistics structure */
struct fddi_statistics {
@@ -193,5 +194,6 @@ struct fddi_statistics {
__u32 port_ler_flag[2];
__u32 port_hardware_present[2];
};
#endif /* __KERNEL__ */
#endif /* _LINUX_IF_FDDI_H */
include/linux/if_frad.h
-1
View File
@@ -24,7 +24,6 @@
#ifndef _FRAD_H_
#define _FRAD_H_
#include <linux/config.h>
#include <linux/if.h>
#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
include/linux/if_tr.h
-1
View File
@@ -43,7 +43,6 @@ struct trh_hdr {
};
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/skbuff.h>
static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb)
include/linux/init.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_INIT_H
#define _LINUX_INIT_H
#include <linux/config.h>
#include <linux/compiler.h>
/* These macros are used to mark some functions or
include/linux/inotify.h
-1
View File
@@ -67,7 +67,6 @@ struct inotify_event {
#include <linux/dcache.h>
#include <linux/fs.h>
#include <linux/config.h>
#ifdef CONFIG_INOTIFY
include/linux/input.h
+1
View File
@@ -15,6 +15,7 @@
#else
#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <asm/types.h>
#endif
include/linux/interrupt.h
-1
View File
@@ -2,7 +2,6 @@
#ifndef _LINUX_INTERRUPT_H
#define _LINUX_INTERRUPT_H
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/linkage.h>
#include <linux/bitops.h>
include/linux/ipmi.h
+1 -1
View File
@@ -36,7 +36,6 @@
#include <linux/ipmi_msgdefs.h>
#include <linux/compiler.h>
#include <linux/device.h>
/*
* This file describes an interface to an IPMI driver. You have to
@@ -210,6 +209,7 @@ struct kernel_ipmi_msg
*/
#include <linux/list.h>
#include <linux/module.h>
#include <linux/device.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
include/linux/ipv6.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _IPV6_H
#define _IPV6_H
#include <linux/config.h>
#include <linux/in6.h>
#include <asm/byteorder.h>
include/linux/irq.h
-1
View File
@@ -9,7 +9,6 @@
* Thanks. --rmk
*/
#include <linux/config.h>
#include <linux/smp.h>
#if !defined(CONFIG_S390)
include/linux/irq_cpustat.h
-1
View File
@@ -9,7 +9,6 @@
* Keith Owens <kaos@ocs.com.au> July 2000.
*/
#include <linux/config.h>
/*
* Simple wrappers reducing source bloat. Define all irq_stat fields
include/linux/isapnp.h
-1
View File
@@ -22,7 +22,6 @@
#ifndef LINUX_ISAPNP_H
#define LINUX_ISAPNP_H
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/pnp.h>
include/linux/isdn.h
-1
View File
@@ -146,7 +146,6 @@ typedef struct {
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/major.h>
include/linux/isdn/tpam.h
-1
View File
@@ -26,7 +26,6 @@
#define _TPAM_H_
#include <linux/types.h>
#include <linux/pci.h>
/* IOCTL commands */
#define TPAM_CMD_DSPLOAD 0x0001
include/linux/isdn_ppp.h
-1
View File
@@ -67,7 +67,6 @@ struct isdn_ppp_comp_data {
#ifdef __KERNEL__
#include <linux/config.h>
#ifdef CONFIG_IPPP_FILTER
#include <linux/filter.h>
include/linux/isdnif.h
-1
View File
@@ -54,7 +54,6 @@
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/skbuff.h>
/***************************************************************************/
include/linux/joystick.h
+11 -11
View File
@@ -111,25 +111,25 @@ struct js_corr {
#define JS_SET_ALL 8
struct JS_DATA_TYPE {
int32_t buttons;
int32_t x;
int32_t y;
__s32 buttons;
__s32 x;
__s32 y;
};
struct JS_DATA_SAVE_TYPE_32 {
int32_t JS_TIMEOUT;
int32_t BUSY;
int32_t JS_EXPIRETIME;
int32_t JS_TIMELIMIT;
__s32 JS_TIMEOUT;
__s32 BUSY;
__s32 JS_EXPIRETIME;
__s32 JS_TIMELIMIT;
struct JS_DATA_TYPE JS_SAVE;
struct JS_DATA_TYPE JS_CORR;
};
struct JS_DATA_SAVE_TYPE_64 {
int32_t JS_TIMEOUT;
int32_t BUSY;
int64_t JS_EXPIRETIME;
int64_t JS_TIMELIMIT;
__s32 JS_TIMEOUT;
__s32 BUSY;
__s64 JS_EXPIRETIME;
__s64 JS_TIMELIMIT;
struct JS_DATA_TYPE JS_SAVE;
struct JS_DATA_TYPE JS_CORR;
};
include/linux/kallsyms.h
-1
View File
@@ -5,7 +5,6 @@
#ifndef _LINUX_KALLSYMS_H
#define _LINUX_KALLSYMS_H
#include <linux/config.h>
#define KSYM_NAME_LEN 127
include/linux/kernel_stat.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_KERNEL_STAT_H
#define _LINUX_KERNEL_STAT_H
#include <linux/config.h>
#include <asm/irq.h>
#include <linux/smp.h>
#include <linux/threads.h>
include/linux/kmod.h
-1
View File
@@ -20,7 +20,6 @@
*/
#include <linux/stddef.h>
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/compiler.h>
include/linux/kprobes.h
-1
View File
@@ -29,7 +29,6 @@
* <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
* <prasanna@in.ibm.com> added function-return probes.
*/
#include <linux/config.h>
#include <linux/list.h>
#include <linux/notifier.h>
#include <linux/smp.h>
include/linux/linkage.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_LINKAGE_H
#define _LINUX_LINKAGE_H
#include <linux/config.h>
#include <asm/linkage.h>
#ifdef __cplusplus
include/linux/lockd/lockd.h
-1
View File
@@ -11,7 +11,6 @@
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/in.h>
#include <linux/fs.h>
#include <linux/kref.h>
include/linux/lockd/nlm.h
-1
View File
@@ -9,7 +9,6 @@
#ifndef LINUX_LOCKD_NLM_H
#define LINUX_LOCKD_NLM_H
#include <linux/config.h>
/* Maximum file offset in file_lock.fl_end */
# define NLM_OFFSET_MAX ((s32) 0x7fffffff)
include/linux/mempolicy.h
-1
View File
@@ -28,7 +28,6 @@
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/mmzone.h>
#include <linux/slab.h>
#include <linux/rbtree.h>
include/linux/migrate.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_MIGRATE_H
#define _LINUX_MIGRATE_H
#include <linux/config.h>
#include <linux/mm.h>
#ifdef CONFIG_MIGRATION
include/linux/mii.h
+15 -15
View File
@@ -9,7 +9,6 @@
#define __LINUX_MII_H__
#include <linux/types.h>
#include <linux/if.h>
/* Generic MII registers. */
@@ -136,6 +135,20 @@
#define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */
#define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */
/* This structure is used in all SIOCxMIIxxx ioctl calls */
struct mii_ioctl_data {
__u16 phy_id;
__u16 reg_num;
__u16 val_in;
__u16 val_out;
};
#ifdef __KERNEL__
#include <linux/if.h>
struct ethtool_cmd;
struct mii_if_info {
int phy_id;
int advertising;
@@ -151,9 +164,6 @@ struct mii_if_info {
void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
};
struct ethtool_cmd;
struct mii_ioctl_data;
extern int mii_link_ok (struct mii_if_info *mii);
extern int mii_nway_restart (struct mii_if_info *mii);
extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
@@ -168,16 +178,6 @@ extern int generic_mii_ioctl(struct mii_if_info *mii_if,
unsigned int *duplex_changed);
/* This structure is used in all SIOCxMIIxxx ioctl calls */
struct mii_ioctl_data {
u16 phy_id;
u16 reg_num;
u16 val_in;
u16 val_out;
};
static inline struct mii_ioctl_data *if_mii(struct ifreq *rq)
{
return (struct mii_ioctl_data *) &rq->ifr_ifru;
@@ -235,5 +235,5 @@ static inline unsigned int mii_duplex (unsigned int duplex_lock,
return 0;
}
#endif /* __KERNEL__ */
#endif /* __LINUX_MII_H__ */
include/linux/mm.h
-1
View File
@@ -7,7 +7,6 @@
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/gfp.h>
#include <linux/list.h>
#include <linux/mmzone.h>
include/linux/mman.h
+7 -5
View File
@@ -1,10 +1,6 @@
#ifndef _LINUX_MMAN_H
#define _LINUX_MMAN_H
#include <linux/config.h>
#include <linux/mm.h>
#include <asm/atomic.h>
#include <asm/mman.h>
#define MREMAP_MAYMOVE 1
@@ -13,6 +9,12 @@
#define OVERCOMMIT_GUESS 0
#define OVERCOMMIT_ALWAYS 1
#define OVERCOMMIT_NEVER 2
#ifdef __KERNEL__
#include <linux/mm.h>
#include <asm/atomic.h>
extern int sysctl_overcommit_memory;
extern int sysctl_overcommit_ratio;
extern atomic_t vm_committed_space;
@@ -63,5 +65,5 @@ calc_vm_flag_bits(unsigned long flags)
_calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) |
_calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED );
}
#endif /* __KERNEL__ */
#endif /* _LINUX_MMAN_H */
include/linux/mmzone.h
-1
View File
@@ -4,7 +4,6 @@
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <linux/config.h>
#include <linux/spinlock.h>
#include <linux/list.h>
#include <linux/wait.h>
include/linux/module.h
-1
View File
@@ -6,7 +6,6 @@
* Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996
* Rewritten again by Rusty Russell, 2002
*/
#include <linux/config.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/list.h>
include/linux/msg.h
+1 -1
View File
@@ -2,7 +2,6 @@
#define _LINUX_MSG_H
#include <linux/ipc.h>
#include <linux/list.h>
/* ipcs ctl commands */
#define MSG_STAT 11
@@ -63,6 +62,7 @@ struct msginfo {
#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
#ifdef __KERNEL__
#include <linux/list.h>
/* one msg_msg structure for each message */
struct msg_msg {
include/linux/mtd/cfi.h
-1
View File
@@ -7,7 +7,6 @@
#ifndef __MTD_CFI_H__
#define __MTD_CFI_H__
#include <linux/config.h>
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/interrupt.h>
include/linux/mtd/map.h
-1
View File
@@ -5,7 +5,6 @@
#ifndef __LINUX_MTD_MAP_H__
#define __LINUX_MTD_MAP_H__
#include <linux/config.h>
#include <linux/types.h>
#include <linux/list.h>
#include <linux/string.h>
include/linux/mtd/mtd.h
-1
View File
@@ -13,7 +13,6 @@
#error This is a kernel header. Perhaps include mtd-user.h instead?
#endif
#include <linux/config.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/uio.h>
include/linux/mtd/nand.h
-1
View File
@@ -20,7 +20,6 @@
#ifndef __LINUX_MTD_NAND_H
#define __LINUX_MTD_NAND_H
#include <linux/config.h>
#include <linux/wait.h>
#include <linux/spinlock.h>
#include <linux/mtd/mtd.h>
include/linux/mtd/xip.h
-1
View File
@@ -18,7 +18,6 @@
#ifndef __LINUX_MTD_XIP_H__
#define __LINUX_MTD_XIP_H__
#include <linux/config.h>
#ifdef CONFIG_MTD_XIP
include/linux/nbd.h
+6 -6
View File
@@ -77,11 +77,11 @@ struct nbd_device {
* server. All data are in network byte order.
*/
struct nbd_request {
u32 magic;
u32 type; /* == READ || == WRITE */
__u32 magic;
__u32 type; /* == READ || == WRITE */
char handle[8];
u64 from;
u32 len;
__u64 from;
__u32 len;
}
#ifdef __GNUC__
__attribute__ ((packed))
@@ -93,8 +93,8 @@ struct nbd_request {
* it has completed an I/O request (or an error occurs).
*/
struct nbd_reply {
u32 magic;
u32 error; /* 0 = ok, else error */
__u32 magic;
__u32 error; /* 0 = ok, else error */
char handle[8]; /* handle you got from request */
};
#endif
include/linux/ncp_fs.h
+2 -3
View File
@@ -12,8 +12,6 @@
#include <linux/in.h>
#include <linux/types.h>
#include <linux/ncp_fs_i.h>
#include <linux/ncp_fs_sb.h>
#include <linux/ipx.h>
#include <linux/ncp_no.h>
@@ -146,7 +144,8 @@ struct ncp_nls_ioctl
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/ncp_fs_i.h>
#include <linux/ncp_fs_sb.h>
/* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */
#undef PRINTK
include/linux/net.h
+1 -2
View File
@@ -18,9 +18,7 @@
#ifndef _LINUX_NET_H
#define _LINUX_NET_H
#include <linux/config.h>
#include <linux/wait.h>
#include <linux/stringify.h>
#include <asm/socket.h>
struct poll_table_struct;
@@ -57,6 +55,7 @@ typedef enum {
#define __SO_ACCEPTCON (1 << 16) /* performed a listen */
#ifdef __KERNEL__
#include <linux/stringify.h>
#define SOCK_ASYNC_NOSPACE 0
#define SOCK_ASYNC_WAITDATA 1
include/linux/netdevice.h
-1
View File
@@ -34,7 +34,6 @@
#include <asm/cache.h>
#include <asm/byteorder.h>
#include <linux/config.h>
#include <linux/device.h>
#include <linux/percpu.h>
#include <linux/dmaengine.h>
include/linux/netfilter.h
-1
View File
@@ -40,7 +40,6 @@
#endif
#ifdef __KERNEL__
#include <linux/config.h>
#ifdef CONFIG_NETFILTER
extern void netfilter_init(void);
include/linux/netfilter/xt_conntrack.h
+1 -1
View File
@@ -42,7 +42,7 @@ struct ip_conntrack_old_tuple
} u;
/* The protocol. */
u16 protonum;
__u16 protonum;
} dst;
};
include/linux/netfilter_arp.h
-1
View File
@@ -5,7 +5,6 @@
* (C)2002 Rusty Russell IBM -- This code is GPL.
*/
#include <linux/config.h>
#include <linux/netfilter.h>
/* There is no PF_ARP. */
include/linux/netfilter_bridge.h
-1
View File
@@ -4,7 +4,6 @@
/* bridge-specific defines for netfilter.
*/
#include <linux/config.h>
#include <linux/netfilter.h>
#if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER)
#include <asm/atomic.h>
include/linux/netfilter_ipv4.h
-1
View File
@@ -5,7 +5,6 @@
* (C)1998 Rusty Russell -- This code is GPL.
*/
#include <linux/config.h>
#include <linux/netfilter.h>
/* only for userspace compatibility */
include/linux/netfilter_ipv4/ip_conntrack.h
-1
View File
@@ -4,7 +4,6 @@
#include <linux/netfilter/nf_conntrack_common.h>
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
#include <linux/bitops.h>
#include <linux/compiler.h>
include/linux/netfilter_ipv4/listhelp.h
-1
View File
@@ -1,6 +1,5 @@
#ifndef _LISTHELP_H
#define _LISTHELP_H
#include <linux/config.h>
#include <linux/list.h>
/* Header to do more comprehensive job than linux/list.h; assume list
include/linux/nfs.h
+4 -4
View File
@@ -7,9 +7,6 @@
#ifndef _LINUX_NFS_H
#define _LINUX_NFS_H
#include <linux/sunrpc/msg_prot.h>
#include <linux/string.h>
#define NFS_PROGRAM 100003
#define NFS_PORT 2049
#define NFS_MAXDATA 8192
@@ -129,7 +126,10 @@ enum nfs_ftype {
NFFIFO = 8
};
#if defined(__KERNEL__)
#ifdef __KERNEL__
#include <linux/sunrpc/msg_prot.h>
#include <linux/string.h>
/*
* This is the kernel NFS client file handle representation
*/
include/linux/nfs4.h
+3 -3
View File
@@ -14,7 +14,6 @@
#define _LINUX_NFS4_H
#include <linux/types.h>
#include <linux/list.h>
#define NFS4_VERIFIER_SIZE 8
#define NFS4_FHSIZE 128
@@ -97,6 +96,9 @@ enum nfs4_acl_whotype {
NFS4_ACL_WHO_EVERYONE,
};
#ifdef __KERNEL__
#include <linux/list.h>
struct nfs4_ace {
uint32_t type;
uint32_t flag;
@@ -345,8 +347,6 @@ enum lock_type4 {
#define NFS4_MINOR_VERSION 0
#define NFS4_DEBUG 1
#ifdef __KERNEL__
/* Index of predefined Linux client operations */
enum {
include/linux/nfs_fs.h
+19 -20
View File
@@ -9,26 +9,6 @@
#ifndef _LINUX_NFS_FS_H
#define _LINUX_NFS_FS_H
#include <linux/config.h>
#include <linux/in.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/rwsem.h>
#include <linux/wait.h>
#include <linux/nfs_fs_sb.h>
#include <linux/sunrpc/debug.h>
#include <linux/sunrpc/auth.h>
#include <linux/sunrpc/clnt.h>
#include <linux/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <linux/nfs4.h>
#include <linux/nfs_xdr.h>
#include <linux/rwsem.h>
#include <linux/mempool.h>
/*
* Enable debugging support for nfs client.
@@ -63,6 +43,25 @@
#define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */
#ifdef __KERNEL__
#include <linux/in.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/rwsem.h>
#include <linux/wait.h>
#include <linux/nfs_fs_sb.h>
#include <linux/sunrpc/debug.h>
#include <linux/sunrpc/auth.h>
#include <linux/sunrpc/clnt.h>
#include <linux/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <linux/nfs4.h>
#include <linux/nfs_xdr.h>
#include <linux/rwsem.h>
#include <linux/mempool.h>
/*
* NFSv3/v4 Access mode cache entry
include/linux/nfsd/nfsd.h
-1
View File
@@ -10,7 +10,6 @@
#ifndef LINUX_NFSD_NFSD_H
#define LINUX_NFSD_NFSD_H
#include <linux/config.h>
#include <linux/types.h>
#include <linux/unistd.h>
#include <linux/dirent.h>
include/linux/nfsd/nfsfh.h
-1
View File
@@ -16,7 +16,6 @@
#include <asm/types.h>
#ifdef __KERNEL__
# include <linux/config.h>
# include <linux/types.h>
# include <linux/string.h>
# include <linux/fs.h>
include/linux/nfsd/syscall.h
-1
View File
@@ -11,7 +11,6 @@
#include <asm/types.h>
#ifdef __KERNEL__
# include <linux/config.h>
# include <linux/types.h>
# include <linux/in.h>
#endif
include/linux/numa.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef _LINUX_NUMA_H
#define _LINUX_NUMA_H
#include <linux/config.h>
#ifdef CONFIG_NODES_SHIFT
#define NODES_SHIFT CONFIG_NODES_SHIFT
include/linux/parport.h
-1
View File
@@ -96,7 +96,6 @@ typedef enum {
/* The rest is for the kernel only */
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/jiffies.h>
#include <linux/proc_fs.h>
#include <linux/spinlock.h>

Some files were not shown because too many files have changed in this diff Show More