aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/linux/atmlec.h5
-rw-r--r--include/linux/atmmpc.h45
-rw-r--r--include/linux/cm4000_cs.h10
-rw-r--r--include/linux/dlm_netlink.h18
-rw-r--r--include/linux/dm-ioctl.h42
-rw-r--r--include/linux/dvb/audio.h2
-rw-r--r--include/linux/dvb/video.h22
-rw-r--r--include/linux/if_arcnet.h27
-rw-r--r--include/linux/ip_vs.h26
-rw-r--r--include/linux/ivtvfb.h2
-rw-r--r--include/linux/matroxfb.h2
-rw-r--r--include/linux/pfkeyv2.h242
-rw-r--r--include/linux/selinux_netlink.h6
-rw-r--r--include/sound/asound.h5
-rw-r--r--include/sound/emu10k1.h12
15 files changed, 240 insertions, 226 deletions
diff --git a/include/linux/atmlec.h b/include/linux/atmlec.h
index 6f5a1bab8f50..39c917fd1b96 100644
--- a/include/linux/atmlec.h
+++ b/include/linux/atmlec.h
@@ -11,6 +11,7 @@
11#include <linux/atmioc.h> 11#include <linux/atmioc.h>
12#include <linux/atm.h> 12#include <linux/atm.h>
13#include <linux/if_ether.h> 13#include <linux/if_ether.h>
14#include <linux/types.h>
14 15
15/* ATM lec daemon control socket */ 16/* ATM lec daemon control socket */
16#define ATMLEC_CTRL _IO('a', ATMIOC_LANE) 17#define ATMLEC_CTRL _IO('a', ATMIOC_LANE)
@@ -78,8 +79,8 @@ struct atmlec_msg {
78 } normal; 79 } normal;
79 struct atmlec_config_msg config; 80 struct atmlec_config_msg config;
80 struct { 81 struct {
81 uint16_t lec_id; /* requestor lec_id */ 82 __u16 lec_id; /* requestor lec_id */
82 uint32_t tran_id; /* transaction id */ 83 __u32 tran_id; /* transaction id */
83 unsigned char mac_addr[ETH_ALEN]; /* dst mac addr */ 84 unsigned char mac_addr[ETH_ALEN]; /* dst mac addr */
84 unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */ 85 unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */
85 } proxy; /* 86 } proxy; /*
diff --git a/include/linux/atmmpc.h b/include/linux/atmmpc.h
index ea1650425a12..2aba5787fa63 100644
--- a/include/linux/atmmpc.h
+++ b/include/linux/atmmpc.h
@@ -4,6 +4,7 @@
4#include <linux/atmapi.h> 4#include <linux/atmapi.h>
5#include <linux/atmioc.h> 5#include <linux/atmioc.h>
6#include <linux/atm.h> 6#include <linux/atm.h>
7#include <linux/types.h>
7 8
8#define ATMMPC_CTRL _IO('a', ATMIOC_MPOA) 9#define ATMMPC_CTRL _IO('a', ATMIOC_MPOA)
9#define ATMMPC_DATA _IO('a', ATMIOC_MPOA+1) 10#define ATMMPC_DATA _IO('a', ATMIOC_MPOA+1)
@@ -18,39 +19,39 @@ struct atmmpc_ioc {
18}; 19};
19 20
20typedef struct in_ctrl_info { 21typedef struct in_ctrl_info {
21 uint8_t Last_NHRP_CIE_code; 22 __u8 Last_NHRP_CIE_code;
22 uint8_t Last_Q2931_cause_value; 23 __u8 Last_Q2931_cause_value;
23 uint8_t eg_MPC_ATM_addr[ATM_ESA_LEN]; 24 __u8 eg_MPC_ATM_addr[ATM_ESA_LEN];
24 __be32 tag; 25 __be32 tag;
25 __be32 in_dst_ip; /* IP address this ingress MPC sends packets to */ 26 __be32 in_dst_ip; /* IP address this ingress MPC sends packets to */
26 uint16_t holding_time; 27 __u16 holding_time;
27 uint32_t request_id; 28 __u32 request_id;
28} in_ctrl_info; 29} in_ctrl_info;
29 30
30typedef struct eg_ctrl_info { 31typedef struct eg_ctrl_info {
31 uint8_t DLL_header[256]; 32 __u8 DLL_header[256];
32 uint8_t DH_length; 33 __u8 DH_length;
33 __be32 cache_id; 34 __be32 cache_id;
34 __be32 tag; 35 __be32 tag;
35 __be32 mps_ip; 36 __be32 mps_ip;
36 __be32 eg_dst_ip; /* IP address to which ingress MPC sends packets */ 37 __be32 eg_dst_ip; /* IP address to which ingress MPC sends packets */
37 uint8_t in_MPC_data_ATM_addr[ATM_ESA_LEN]; 38 __u8 in_MPC_data_ATM_addr[ATM_ESA_LEN];
38 uint16_t holding_time; 39 __u16 holding_time;
39} eg_ctrl_info; 40} eg_ctrl_info;
40 41
41struct mpc_parameters { 42struct mpc_parameters {
42 uint16_t mpc_p1; /* Shortcut-Setup Frame Count */ 43 __u16 mpc_p1; /* Shortcut-Setup Frame Count */
43 uint16_t mpc_p2; /* Shortcut-Setup Frame Time */ 44 __u16 mpc_p2; /* Shortcut-Setup Frame Time */
44 uint8_t mpc_p3[8]; /* Flow-detection Protocols */ 45 __u8 mpc_p3[8]; /* Flow-detection Protocols */
45 uint16_t mpc_p4; /* MPC Initial Retry Time */ 46 __u16 mpc_p4; /* MPC Initial Retry Time */
46 uint16_t mpc_p5; /* MPC Retry Time Maximum */ 47 __u16 mpc_p5; /* MPC Retry Time Maximum */
47 uint16_t mpc_p6; /* Hold Down Time */ 48 __u16 mpc_p6; /* Hold Down Time */
48} ; 49} ;
49 50
50struct k_message { 51struct k_message {
51 uint16_t type; 52 __u16 type;
52 __be32 ip_mask; 53 __be32 ip_mask;
53 uint8_t MPS_ctrl[ATM_ESA_LEN]; 54 __u8 MPS_ctrl[ATM_ESA_LEN];
54 union { 55 union {
55 in_ctrl_info in_info; 56 in_ctrl_info in_info;
56 eg_ctrl_info eg_info; 57 eg_ctrl_info eg_info;
@@ -61,11 +62,11 @@ struct k_message {
61 62
62struct llc_snap_hdr { 63struct llc_snap_hdr {
63 /* RFC 1483 LLC/SNAP encapsulation for routed IP PDUs */ 64 /* RFC 1483 LLC/SNAP encapsulation for routed IP PDUs */
64 uint8_t dsap; /* Destination Service Access Point (0xAA) */ 65 __u8 dsap; /* Destination Service Access Point (0xAA) */
65 uint8_t ssap; /* Source Service Access Point (0xAA) */ 66 __u8 ssap; /* Source Service Access Point (0xAA) */
66 uint8_t ui; /* Unnumbered Information (0x03) */ 67 __u8 ui; /* Unnumbered Information (0x03) */
67 uint8_t org[3]; /* Organizational identification (0x000000) */ 68 __u8 org[3]; /* Organizational identification (0x000000) */
68 uint8_t type[2]; /* Ether type (for IP) (0x0800) */ 69 __u8 type[2]; /* Ether type (for IP) (0x0800) */
69}; 70};
70 71
71/* TLVs this MPC recognizes */ 72/* TLVs this MPC recognizes */
diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
index 605ebe24bb2e..72bfefdbd767 100644
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
@@ -1,6 +1,8 @@
1#ifndef _CM4000_H_ 1#ifndef _CM4000_H_
2#define _CM4000_H_ 2#define _CM4000_H_
3 3
4#include <linux/types.h>
5
4#define MAX_ATR 33 6#define MAX_ATR 33
5 7
6#define CM4000_MAX_DEV 4 8#define CM4000_MAX_DEV 4
@@ -10,9 +12,9 @@
10 * not to break compilation of userspace apps. -HW */ 12 * not to break compilation of userspace apps. -HW */
11 13
12typedef struct atreq { 14typedef struct atreq {
13 int32_t atr_len; 15 __s32 atr_len;
14 unsigned char atr[64]; 16 unsigned char atr[64];
15 int32_t power_act; 17 __s32 power_act;
16 unsigned char bIFSD; 18 unsigned char bIFSD;
17 unsigned char bIFSC; 19 unsigned char bIFSC;
18} atreq_t; 20} atreq_t;
@@ -22,13 +24,13 @@ typedef struct atreq {
22 * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace 24 * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace
23 * will lay out the structure members differently than the 64bit kernel. 25 * will lay out the structure members differently than the 64bit kernel.
24 * 26 *
25 * I've changed "ptsreq.protocol" from "unsigned long" to "u_int32_t". 27 * I've changed "ptsreq.protocol" from "unsigned long" to "__u32".
26 * On 32bit this will make no difference. With 64bit kernels, it will make 28 * On 32bit this will make no difference. With 64bit kernels, it will make
27 * 32bit apps work, too. 29 * 32bit apps work, too.
28 */ 30 */
29 31
30typedef struct ptsreq { 32typedef struct ptsreq {
31 u_int32_t protocol; /*T=0: 2^0, T=1: 2^1*/ 33 __u32 protocol; /*T=0: 2^0, T=1: 2^1*/
32 unsigned char flags; 34 unsigned char flags;
33 unsigned char pts1; 35 unsigned char pts1;
34 unsigned char pts2; 36 unsigned char pts2;
diff --git a/include/linux/dlm_netlink.h b/include/linux/dlm_netlink.h
index 19276332707a..647c8ef27227 100644
--- a/include/linux/dlm_netlink.h
+++ b/include/linux/dlm_netlink.h
@@ -9,6 +9,8 @@
9#ifndef _DLM_NETLINK_H 9#ifndef _DLM_NETLINK_H
10#define _DLM_NETLINK_H 10#define _DLM_NETLINK_H
11 11
12#include <linux/types.h>
13
12enum { 14enum {
13 DLM_STATUS_WAITING = 1, 15 DLM_STATUS_WAITING = 1,
14 DLM_STATUS_GRANTED = 2, 16 DLM_STATUS_GRANTED = 2,
@@ -18,16 +20,16 @@ enum {
18#define DLM_LOCK_DATA_VERSION 1 20#define DLM_LOCK_DATA_VERSION 1
19 21
20struct dlm_lock_data { 22struct dlm_lock_data {
21 uint16_t version; 23 __u16 version;
22 uint32_t lockspace_id; 24 __u32 lockspace_id;
23 int nodeid; 25 int nodeid;
24 int ownpid; 26 int ownpid;
25 uint32_t id; 27 __u32 id;
26 uint32_t remid; 28 __u32 remid;
27 uint64_t xid; 29 __u64 xid;
28 int8_t status; 30 __s8 status;
29 int8_t grmode; 31 __s8 grmode;
30 int8_t rqmode; 32 __s8 rqmode;
31 unsigned long timestamp; 33 unsigned long timestamp;
32 int resource_namelen; 34 int resource_namelen;
33 char resource_name[DLM_RESNAME_MAXLEN]; 35 char resource_name[DLM_RESNAME_MAXLEN];
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index 28c2940eb30d..48e44ee2b466 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -113,20 +113,20 @@ struct dm_ioctl {
113 * return -ENOTTY) fill out this field, even if the 113 * return -ENOTTY) fill out this field, even if the
114 * command failed. 114 * command failed.
115 */ 115 */
116 uint32_t version[3]; /* in/out */ 116 __u32 version[3]; /* in/out */
117 uint32_t data_size; /* total size of data passed in 117 __u32 data_size; /* total size of data passed in
118 * including this struct */ 118 * including this struct */
119 119
120 uint32_t data_start; /* offset to start of data 120 __u32 data_start; /* offset to start of data
121 * relative to start of this struct */ 121 * relative to start of this struct */
122 122
123 uint32_t target_count; /* in/out */ 123 __u32 target_count; /* in/out */
124 int32_t open_count; /* out */ 124 __s32 open_count; /* out */
125 uint32_t flags; /* in/out */ 125 __u32 flags; /* in/out */
126 uint32_t event_nr; /* in/out */ 126 __u32 event_nr; /* in/out */
127 uint32_t padding; 127 __u32 padding;
128 128
129 uint64_t dev; /* in/out */ 129 __u64 dev; /* in/out */
130 130
131 char name[DM_NAME_LEN]; /* device name */ 131 char name[DM_NAME_LEN]; /* device name */
132 char uuid[DM_UUID_LEN]; /* unique identifier for 132 char uuid[DM_UUID_LEN]; /* unique identifier for
@@ -139,9 +139,9 @@ struct dm_ioctl {
139 * dm_ioctl. 139 * dm_ioctl.
140 */ 140 */
141struct dm_target_spec { 141struct dm_target_spec {
142 uint64_t sector_start; 142 __u64 sector_start;
143 uint64_t length; 143 __u64 length;
144 int32_t status; /* used when reading from kernel only */ 144 __s32 status; /* used when reading from kernel only */
145 145
146 /* 146 /*
147 * Location of the next dm_target_spec. 147 * Location of the next dm_target_spec.
@@ -153,7 +153,7 @@ struct dm_target_spec {
153 * (that follows the dm_ioctl struct) to the start of the "next" 153 * (that follows the dm_ioctl struct) to the start of the "next"
154 * dm_target_spec. 154 * dm_target_spec.
155 */ 155 */
156 uint32_t next; 156 __u32 next;
157 157
158 char target_type[DM_MAX_TYPE_NAME]; 158 char target_type[DM_MAX_TYPE_NAME];
159 159
@@ -168,17 +168,17 @@ struct dm_target_spec {
168 * Used to retrieve the target dependencies. 168 * Used to retrieve the target dependencies.
169 */ 169 */
170struct dm_target_deps { 170struct dm_target_deps {
171 uint32_t count; /* Array size */ 171 __u32 count; /* Array size */
172 uint32_t padding; /* unused */ 172 __u32 padding; /* unused */
173 uint64_t dev[0]; /* out */ 173 __u64 dev[0]; /* out */
174}; 174};
175 175
176/* 176/*
177 * Used to get a list of all dm devices. 177 * Used to get a list of all dm devices.
178 */ 178 */
179struct dm_name_list { 179struct dm_name_list {
180 uint64_t dev; 180 __u64 dev;
181 uint32_t next; /* offset to the next record from 181 __u32 next; /* offset to the next record from
182 the _start_ of this */ 182 the _start_ of this */
183 char name[0]; 183 char name[0];
184}; 184};
@@ -187,8 +187,8 @@ struct dm_name_list {
187 * Used to retrieve the target versions 187 * Used to retrieve the target versions
188 */ 188 */
189struct dm_target_versions { 189struct dm_target_versions {
190 uint32_t next; 190 __u32 next;
191 uint32_t version[3]; 191 __u32 version[3];
192 192
193 char name[0]; 193 char name[0];
194}; 194};
@@ -197,7 +197,7 @@ struct dm_target_versions {
197 * Used to pass message to a target 197 * Used to pass message to a target
198 */ 198 */
199struct dm_target_msg { 199struct dm_target_msg {
200 uint64_t sector; /* Device sector */ 200 __u64 sector; /* Device sector */
201 201
202 char message[0]; 202 char message[0];
203}; 203};
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h
index bb0df2aaebfa..fec66bd24f22 100644
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
@@ -76,7 +76,7 @@ struct audio_karaoke{ /* if Vocal1 or Vocal2 are non-zero, they get mixed */
76} audio_karaoke_t; /* into left and right */ 76} audio_karaoke_t; /* into left and right */
77 77
78 78
79typedef uint16_t audio_attributes_t; 79typedef __u16 audio_attributes_t;
80/* bits: descr. */ 80/* bits: descr. */
81/* 15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */ 81/* 15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
82/* 12 multichannel extension */ 82/* 12 multichannel extension */
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index ee5d2df2d78d..1d750c0fd86e 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -132,7 +132,7 @@ struct video_command {
132#define VIDEO_VSYNC_FIELD_PROGRESSIVE (3) 132#define VIDEO_VSYNC_FIELD_PROGRESSIVE (3)
133 133
134struct video_event { 134struct video_event {
135 int32_t type; 135 __s32 type;
136#define VIDEO_EVENT_SIZE_CHANGED 1 136#define VIDEO_EVENT_SIZE_CHANGED 1
137#define VIDEO_EVENT_FRAME_RATE_CHANGED 2 137#define VIDEO_EVENT_FRAME_RATE_CHANGED 2
138#define VIDEO_EVENT_DECODER_STOPPED 3 138#define VIDEO_EVENT_DECODER_STOPPED 3
@@ -157,25 +157,25 @@ struct video_status {
157 157
158struct video_still_picture { 158struct video_still_picture {
159 char __user *iFrame; /* pointer to a single iframe in memory */ 159 char __user *iFrame; /* pointer to a single iframe in memory */
160 int32_t size; 160 __s32 size;
161}; 161};
162 162
163 163
164typedef 164typedef
165struct video_highlight { 165struct video_highlight {
166 int active; /* 1=show highlight, 0=hide highlight */ 166 int active; /* 1=show highlight, 0=hide highlight */
167 uint8_t contrast1; /* 7- 4 Pattern pixel contrast */ 167 __u8 contrast1; /* 7- 4 Pattern pixel contrast */
168 /* 3- 0 Background pixel contrast */ 168 /* 3- 0 Background pixel contrast */
169 uint8_t contrast2; /* 7- 4 Emphasis pixel-2 contrast */ 169 __u8 contrast2; /* 7- 4 Emphasis pixel-2 contrast */
170 /* 3- 0 Emphasis pixel-1 contrast */ 170 /* 3- 0 Emphasis pixel-1 contrast */
171 uint8_t color1; /* 7- 4 Pattern pixel color */ 171 __u8 color1; /* 7- 4 Pattern pixel color */
172 /* 3- 0 Background pixel color */ 172 /* 3- 0 Background pixel color */
173 uint8_t color2; /* 7- 4 Emphasis pixel-2 color */ 173 __u8 color2; /* 7- 4 Emphasis pixel-2 color */
174 /* 3- 0 Emphasis pixel-1 color */ 174 /* 3- 0 Emphasis pixel-1 color */
175 uint32_t ypos; /* 23-22 auto action mode */ 175 __u32 ypos; /* 23-22 auto action mode */
176 /* 21-12 start y */ 176 /* 21-12 start y */
177 /* 9- 0 end y */ 177 /* 9- 0 end y */
178 uint32_t xpos; /* 23-22 button color number */ 178 __u32 xpos; /* 23-22 button color number */
179 /* 21-12 start x */ 179 /* 21-12 start x */
180 /* 9- 0 end x */ 180 /* 9- 0 end x */
181} video_highlight_t; 181} video_highlight_t;
@@ -189,17 +189,17 @@ typedef struct video_spu {
189 189
190typedef struct video_spu_palette { /* SPU Palette information */ 190typedef struct video_spu_palette { /* SPU Palette information */
191 int length; 191 int length;
192 uint8_t __user *palette; 192 __u8 __user *palette;
193} video_spu_palette_t; 193} video_spu_palette_t;
194 194
195 195
196typedef struct video_navi_pack { 196typedef struct video_navi_pack {
197 int length; /* 0 ... 1024 */ 197 int length; /* 0 ... 1024 */
198 uint8_t data[1024]; 198 __u8 data[1024];
199} video_navi_pack_t; 199} video_navi_pack_t;
200 200
201 201
202typedef uint16_t video_attributes_t; 202typedef __u16 video_attributes_t;
203/* bits: descr. */ 203/* bits: descr. */
204/* 15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) */ 204/* 15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) */
205/* 13-12 TV system (0=525/60, 1=625/50) */ 205/* 13-12 TV system (0=525/60, 1=625/50) */
diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index 27ea2ac445ad..0835debab115 100644
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -16,6 +16,7 @@
16#ifndef _LINUX_IF_ARCNET_H 16#ifndef _LINUX_IF_ARCNET_H
17#define _LINUX_IF_ARCNET_H 17#define _LINUX_IF_ARCNET_H
18 18
19#include <linux/types.h>
19#include <linux/if_ether.h> 20#include <linux/if_ether.h>
20 21
21 22
@@ -57,10 +58,10 @@
57 */ 58 */
58struct arc_rfc1201 59struct arc_rfc1201
59{ 60{
60 uint8_t proto; /* protocol ID field - varies */ 61 __u8 proto; /* protocol ID field - varies */
61 uint8_t split_flag; /* for use with split packets */ 62 __u8 split_flag; /* for use with split packets */
62 __be16 sequence; /* sequence number */ 63 __be16 sequence; /* sequence number */
63 uint8_t payload[0]; /* space remaining in packet (504 bytes)*/ 64 __u8 payload[0]; /* space remaining in packet (504 bytes)*/
64}; 65};
65#define RFC1201_HDR_SIZE 4 66#define RFC1201_HDR_SIZE 4
66 67
@@ -70,8 +71,8 @@ struct arc_rfc1201
70 */ 71 */
71struct arc_rfc1051 72struct arc_rfc1051
72{ 73{
73 uint8_t proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */ 74 __u8 proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */
74 uint8_t payload[0]; /* 507 bytes */ 75 __u8 payload[0]; /* 507 bytes */
75}; 76};
76#define RFC1051_HDR_SIZE 1 77#define RFC1051_HDR_SIZE 1
77 78
@@ -82,20 +83,20 @@ struct arc_rfc1051
82 */ 83 */
83struct arc_eth_encap 84struct arc_eth_encap
84{ 85{
85 uint8_t proto; /* Always ARC_P_ETHER */ 86 __u8 proto; /* Always ARC_P_ETHER */
86 struct ethhdr eth; /* standard ethernet header (yuck!) */ 87 struct ethhdr eth; /* standard ethernet header (yuck!) */
87 uint8_t payload[0]; /* 493 bytes */ 88 __u8 payload[0]; /* 493 bytes */
88}; 89};
89#define ETH_ENCAP_HDR_SIZE 14 90#define ETH_ENCAP_HDR_SIZE 14
90 91
91 92
92struct arc_cap 93struct arc_cap
93{ 94{
94 uint8_t proto; 95 __u8 proto;
95 uint8_t cookie[sizeof(int)]; /* Actually NOT sent over the network */ 96 __u8 cookie[sizeof(int)]; /* Actually NOT sent over the network */
96 union { 97 union {
97 uint8_t ack; 98 __u8 ack;
98 uint8_t raw[0]; /* 507 bytes */ 99 __u8 raw[0]; /* 507 bytes */
99 } mes; 100 } mes;
100}; 101};
101 102
@@ -109,7 +110,7 @@ struct arc_cap
109 */ 110 */
110struct arc_hardware 111struct arc_hardware
111{ 112{
112 uint8_t source, /* source ARCnet - filled in automagically */ 113 __u8 source, /* source ARCnet - filled in automagically */
113 dest, /* destination ARCnet - 0 for broadcast */ 114 dest, /* destination ARCnet - 0 for broadcast */
114 offset[2]; /* offset bytes (some weird semantics) */ 115 offset[2]; /* offset bytes (some weird semantics) */
115}; 116};
@@ -130,7 +131,7 @@ struct archdr
130 struct arc_rfc1051 rfc1051; 131 struct arc_rfc1051 rfc1051;
131 struct arc_eth_encap eth_encap; 132 struct arc_eth_encap eth_encap;
132 struct arc_cap cap; 133 struct arc_cap cap;
133 uint8_t raw[0]; /* 508 bytes */ 134 __u8 raw[0]; /* 508 bytes */
134 } soft; 135 } soft;
135}; 136};
136 137
diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
index 0f434a28fb58..148265e63e8d 100644
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
@@ -96,10 +96,10 @@
96 */ 96 */
97struct ip_vs_service_user { 97struct ip_vs_service_user {
98 /* virtual service addresses */ 98 /* virtual service addresses */
99 u_int16_t protocol; 99 __u16 protocol;
100 __be32 addr; /* virtual ip address */ 100 __be32 addr; /* virtual ip address */
101 __be16 port; 101 __be16 port;
102 u_int32_t fwmark; /* firwall mark of service */ 102 __u32 fwmark; /* firwall mark of service */
103 103
104 /* virtual service options */ 104 /* virtual service options */
105 char sched_name[IP_VS_SCHEDNAME_MAXLEN]; 105 char sched_name[IP_VS_SCHEDNAME_MAXLEN];
@@ -119,8 +119,8 @@ struct ip_vs_dest_user {
119 int weight; /* destination weight */ 119 int weight; /* destination weight */
120 120
121 /* thresholds for active connections */ 121 /* thresholds for active connections */
122 u_int32_t u_threshold; /* upper threshold */ 122 __u32 u_threshold; /* upper threshold */
123 u_int32_t l_threshold; /* lower threshold */ 123 __u32 l_threshold; /* lower threshold */
124}; 124};
125 125
126 126
@@ -159,10 +159,10 @@ struct ip_vs_getinfo {
159/* The argument to IP_VS_SO_GET_SERVICE */ 159/* The argument to IP_VS_SO_GET_SERVICE */
160struct ip_vs_service_entry { 160struct ip_vs_service_entry {
161 /* which service: user fills in these */ 161 /* which service: user fills in these */
162 u_int16_t protocol; 162 __u16 protocol;
163 __be32 addr; /* virtual address */ 163 __be32 addr; /* virtual address */
164 __be16 port; 164 __be16 port;
165 u_int32_t fwmark; /* firwall mark of service */ 165 __u32 fwmark; /* firwall mark of service */
166 166
167 /* service options */ 167 /* service options */
168 char sched_name[IP_VS_SCHEDNAME_MAXLEN]; 168 char sched_name[IP_VS_SCHEDNAME_MAXLEN];
@@ -184,12 +184,12 @@ struct ip_vs_dest_entry {
184 unsigned conn_flags; /* connection flags */ 184 unsigned conn_flags; /* connection flags */
185 int weight; /* destination weight */ 185 int weight; /* destination weight */
186 186
187 u_int32_t u_threshold; /* upper threshold */ 187 __u32 u_threshold; /* upper threshold */
188 u_int32_t l_threshold; /* lower threshold */ 188 __u32 l_threshold; /* lower threshold */
189 189
190 u_int32_t activeconns; /* active connections */ 190 __u32 activeconns; /* active connections */
191 u_int32_t inactconns; /* inactive connections */ 191 __u32 inactconns; /* inactive connections */
192 u_int32_t persistconns; /* persistent connections */ 192 __u32 persistconns; /* persistent connections */
193 193
194 /* statistics */ 194 /* statistics */
195 struct ip_vs_stats_user stats; 195 struct ip_vs_stats_user stats;
@@ -199,10 +199,10 @@ struct ip_vs_dest_entry {
199/* The argument to IP_VS_SO_GET_DESTS */ 199/* The argument to IP_VS_SO_GET_DESTS */
200struct ip_vs_get_dests { 200struct ip_vs_get_dests {
201 /* which service: user fills in these */ 201 /* which service: user fills in these */
202 u_int16_t protocol; 202 __u16 protocol;
203 __be32 addr; /* virtual address */ 203 __be32 addr; /* virtual address */
204 __be16 port; 204 __be16 port;
205 u_int32_t fwmark; /* firwall mark of service */ 205 __u32 fwmark; /* firwall mark of service */
206 206
207 /* number of real servers */ 207 /* number of real servers */
208 unsigned int num_dests; 208 unsigned int num_dests;
diff --git a/include/linux/ivtvfb.h b/include/linux/ivtvfb.h
index e20af47b59ad..9d88b29ddf55 100644
--- a/include/linux/ivtvfb.h
+++ b/include/linux/ivtvfb.h
@@ -33,6 +33,6 @@ struct ivtvfb_dma_frame {
33}; 33};
34 34
35#define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) 35#define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
36#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) 36#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
37 37
38#endif 38#endif
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h
index 404f678e734b..2203121a43e9 100644
--- a/include/linux/matroxfb.h
+++ b/include/linux/matroxfb.h
@@ -37,7 +37,7 @@ enum matroxfb_ctrl_id {
37 MATROXFB_CID_LAST 37 MATROXFB_CID_LAST
38}; 38};
39 39
40#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) 40#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
41 41
42#endif 42#endif
43 43
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index 01b262959f2e..228b0b6306b0 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -12,187 +12,187 @@
12#define PFKEYV2_REVISION 199806L 12#define PFKEYV2_REVISION 199806L
13 13
14struct sadb_msg { 14struct sadb_msg {
15 uint8_t sadb_msg_version; 15 __u8 sadb_msg_version;
16 uint8_t sadb_msg_type; 16 __u8 sadb_msg_type;
17 uint8_t sadb_msg_errno; 17 __u8 sadb_msg_errno;
18 uint8_t sadb_msg_satype; 18 __u8 sadb_msg_satype;
19 uint16_t sadb_msg_len; 19 __u16 sadb_msg_len;
20 uint16_t sadb_msg_reserved; 20 __u16 sadb_msg_reserved;
21 uint32_t sadb_msg_seq; 21 __u32 sadb_msg_seq;
22 uint32_t sadb_msg_pid; 22 __u32 sadb_msg_pid;
23} __attribute__((packed)); 23} __attribute__((packed));
24/* sizeof(struct sadb_msg) == 16 */ 24/* sizeof(struct sadb_msg) == 16 */
25 25
26struct sadb_ext { 26struct sadb_ext {
27 uint16_t sadb_ext_len; 27 __u16 sadb_ext_len;
28 uint16_t sadb_ext_type; 28 __u16 sadb_ext_type;
29} __attribute__((packed)); 29} __attribute__((packed));
30/* sizeof(struct sadb_ext) == 4 */ 30/* sizeof(struct sadb_ext) == 4 */
31 31
32struct sadb_sa { 32struct sadb_sa {
33 uint16_t sadb_sa_len; 33 __u16 sadb_sa_len;
34 uint16_t sadb_sa_exttype; 34 __u16 sadb_sa_exttype;
35 __be32 sadb_sa_spi; 35 __be32 sadb_sa_spi;
36 uint8_t sadb_sa_replay; 36 __u8 sadb_sa_replay;
37 uint8_t sadb_sa_state; 37 __u8 sadb_sa_state;
38 uint8_t sadb_sa_auth; 38 __u8 sadb_sa_auth;
39 uint8_t sadb_sa_encrypt; 39 __u8 sadb_sa_encrypt;
40 uint32_t sadb_sa_flags; 40 __u32 sadb_sa_flags;
41} __attribute__((packed)); 41} __attribute__((packed));
42/* sizeof(struct sadb_sa) == 16 */ 42/* sizeof(struct sadb_sa) == 16 */
43 43
44struct sadb_lifetime { 44struct sadb_lifetime {
45 uint16_t sadb_lifetime_len; 45 __u16 sadb_lifetime_len;
46 uint16_t sadb_lifetime_exttype; 46 __u16 sadb_lifetime_exttype;
47 uint32_t sadb_lifetime_allocations; 47 __u32 sadb_lifetime_allocations;
48 uint64_t sadb_lifetime_bytes; 48 __u64 sadb_lifetime_bytes;
49 uint64_t sadb_lifetime_addtime; 49 __u64 sadb_lifetime_addtime;
50 uint64_t sadb_lifetime_usetime; 50 __u64 sadb_lifetime_usetime;
51} __attribute__((packed)); 51} __attribute__((packed));
52/* sizeof(struct sadb_lifetime) == 32 */ 52/* sizeof(struct sadb_lifetime) == 32 */
53 53
54struct sadb_address { 54struct sadb_address {
55 uint16_t sadb_address_len; 55 __u16 sadb_address_len;
56 uint16_t sadb_address_exttype; 56 __u16 sadb_address_exttype;
57 uint8_t sadb_address_proto; 57 __u8 sadb_address_proto;
58 uint8_t sadb_address_prefixlen; 58 __u8 sadb_address_prefixlen;
59 uint16_t sadb_address_reserved; 59 __u16 sadb_address_reserved;
60} __attribute__((packed)); 60} __attribute__((packed));
61/* sizeof(struct sadb_address) == 8 */ 61/* sizeof(struct sadb_address) == 8 */
62 62
63struct sadb_key { 63struct sadb_key {
64 uint16_t sadb_key_len; 64 __u16 sadb_key_len;
65 uint16_t sadb_key_exttype; 65 __u16 sadb_key_exttype;
66 uint16_t sadb_key_bits; 66 __u16 sadb_key_bits;
67 uint16_t sadb_key_reserved; 67 __u16 sadb_key_reserved;
68} __attribute__((packed)); 68} __attribute__((packed));
69/* sizeof(struct sadb_key) == 8 */ 69/* sizeof(struct sadb_key) == 8 */
70 70
71struct sadb_ident { 71struct sadb_ident {
72 uint16_t sadb_ident_len; 72 __u16 sadb_ident_len;
73 uint16_t sadb_ident_exttype; 73 __u16 sadb_ident_exttype;
74 uint16_t sadb_ident_type; 74 __u16 sadb_ident_type;
75 uint16_t sadb_ident_reserved; 75 __u16 sadb_ident_reserved;
76 uint64_t sadb_ident_id; 76 __u64 sadb_ident_id;
77} __attribute__((packed)); 77} __attribute__((packed));
78/* sizeof(struct sadb_ident) == 16 */ 78/* sizeof(struct sadb_ident) == 16 */
79 79
80struct sadb_sens { 80struct sadb_sens {
81 uint16_t sadb_sens_len; 81 __u16 sadb_sens_len;
82 uint16_t sadb_sens_exttype; 82 __u16 sadb_sens_exttype;
83 uint32_t sadb_sens_dpd; 83 __u32 sadb_sens_dpd;
84 uint8_t sadb_sens_sens_level; 84 __u8 sadb_sens_sens_level;
85 uint8_t sadb_sens_sens_len; 85 __u8 sadb_sens_sens_len;
86 uint8_t sadb_sens_integ_level; 86 __u8 sadb_sens_integ_level;
87 uint8_t sadb_sens_integ_len; 87 __u8 sadb_sens_integ_len;
88 uint32_t sadb_sens_reserved; 88 __u32 sadb_sens_reserved;
89} __attribute__((packed)); 89} __attribute__((packed));
90/* sizeof(struct sadb_sens) == 16 */ 90/* sizeof(struct sadb_sens) == 16 */
91 91
92/* followed by: 92/* followed by:
93 uint64_t sadb_sens_bitmap[sens_len]; 93 __u64 sadb_sens_bitmap[sens_len];
94 uint64_t sadb_integ_bitmap[integ_len]; */ 94 __u64 sadb_integ_bitmap[integ_len]; */
95 95
96struct sadb_prop { 96struct sadb_prop {
97 uint16_t sadb_prop_len; 97 __u16 sadb_prop_len;
98 uint16_t sadb_prop_exttype; 98 __u16 sadb_prop_exttype;
99 uint8_t sadb_prop_replay; 99 __u8 sadb_prop_replay;
100 uint8_t sadb_prop_reserved[3]; 100 __u8 sadb_prop_reserved[3];
101} __attribute__((packed)); 101} __attribute__((packed));
102/* sizeof(struct sadb_prop) == 8 */ 102/* sizeof(struct sadb_prop) == 8 */
103 103
104/* followed by: 104/* followed by:
105 struct sadb_comb sadb_combs[(sadb_prop_len + 105 struct sadb_comb sadb_combs[(sadb_prop_len +
106 sizeof(uint64_t) - sizeof(struct sadb_prop)) / 106 sizeof(__u64) - sizeof(struct sadb_prop)) /
107 sizeof(struct sadb_comb)]; */ 107 sizeof(struct sadb_comb)]; */
108 108
109struct sadb_comb { 109struct sadb_comb {
110 uint8_t sadb_comb_auth; 110 __u8 sadb_comb_auth;
111 uint8_t sadb_comb_encrypt; 111 __u8 sadb_comb_encrypt;
112 uint16_t sadb_comb_flags; 112 __u16 sadb_comb_flags;
113 uint16_t sadb_comb_auth_minbits; 113 __u16 sadb_comb_auth_minbits;
114 uint16_t sadb_comb_auth_maxbits; 114 __u16 sadb_comb_auth_maxbits;
115 uint16_t sadb_comb_encrypt_minbits; 115 __u16 sadb_comb_encrypt_minbits;
116 uint16_t sadb_comb_encrypt_maxbits; 116 __u16 sadb_comb_encrypt_maxbits;
117 uint32_t sadb_comb_reserved; 117 __u32 sadb_comb_reserved;
118 uint32_t sadb_comb_soft_allocations; 118 __u32 sadb_comb_soft_allocations;
119 uint32_t sadb_comb_hard_allocations; 119 __u32 sadb_comb_hard_allocations;
120 uint64_t sadb_comb_soft_bytes; 120 __u64 sadb_comb_soft_bytes;
121 uint64_t sadb_comb_hard_bytes; 121 __u64 sadb_comb_hard_bytes;
122 uint64_t sadb_comb_soft_addtime; 122 __u64 sadb_comb_soft_addtime;
123 uint64_t sadb_comb_hard_addtime; 123 __u64 sadb_comb_hard_addtime;
124 uint64_t sadb_comb_soft_usetime; 124 __u64 sadb_comb_soft_usetime;
125 uint64_t sadb_comb_hard_usetime; 125 __u64 sadb_comb_hard_usetime;
126} __attribute__((packed)); 126} __attribute__((packed));
127/* sizeof(struct sadb_comb) == 72 */ 127/* sizeof(struct sadb_comb) == 72 */
128 128
129struct sadb_supported { 129struct sadb_supported {
130 uint16_t sadb_supported_len; 130 __u16 sadb_supported_len;
131 uint16_t sadb_supported_exttype; 131 __u16 sadb_supported_exttype;
132 uint32_t sadb_supported_reserved; 132 __u32 sadb_supported_reserved;
133} __attribute__((packed)); 133} __attribute__((packed));
134/* sizeof(struct sadb_supported) == 8 */ 134/* sizeof(struct sadb_supported) == 8 */
135 135
136/* followed by: 136/* followed by:
137 struct sadb_alg sadb_algs[(sadb_supported_len + 137 struct sadb_alg sadb_algs[(sadb_supported_len +
138 sizeof(uint64_t) - sizeof(struct sadb_supported)) / 138 sizeof(__u64) - sizeof(struct sadb_supported)) /
139 sizeof(struct sadb_alg)]; */ 139 sizeof(struct sadb_alg)]; */
140 140
141struct sadb_alg { 141struct sadb_alg {
142 uint8_t sadb_alg_id; 142 __u8 sadb_alg_id;
143 uint8_t sadb_alg_ivlen; 143 __u8 sadb_alg_ivlen;
144 uint16_t sadb_alg_minbits; 144 __u16 sadb_alg_minbits;
145 uint16_t sadb_alg_maxbits; 145 __u16 sadb_alg_maxbits;
146 uint16_t sadb_alg_reserved; 146 __u16 sadb_alg_reserved;
147} __attribute__((packed)); 147} __attribute__((packed));
148/* sizeof(struct sadb_alg) == 8 */ 148/* sizeof(struct sadb_alg) == 8 */
149 149
150struct sadb_spirange { 150struct sadb_spirange {
151 uint16_t sadb_spirange_len; 151 __u16 sadb_spirange_len;
152 uint16_t sadb_spirange_exttype; 152 __u16 sadb_spirange_exttype;
153 uint32_t sadb_spirange_min; 153 __u32 sadb_spirange_min;
154 uint32_t sadb_spirange_max; 154 __u32 sadb_spirange_max;
155 uint32_t sadb_spirange_reserved; 155 __u32 sadb_spirange_reserved;
156} __attribute__((packed)); 156} __attribute__((packed));
157/* sizeof(struct sadb_spirange) == 16 */ 157/* sizeof(struct sadb_spirange) == 16 */
158 158
159struct sadb_x_kmprivate { 159struct sadb_x_kmprivate {
160 uint16_t sadb_x_kmprivate_len; 160 __u16 sadb_x_kmprivate_len;
161 uint16_t sadb_x_kmprivate_exttype; 161 __u16 sadb_x_kmprivate_exttype;
162 uint32_t sadb_x_kmprivate_reserved; 162 __u32 sadb_x_kmprivate_reserved;
163} __attribute__((packed)); 163} __attribute__((packed));
164/* sizeof(struct sadb_x_kmprivate) == 8 */ 164/* sizeof(struct sadb_x_kmprivate) == 8 */
165 165
166struct sadb_x_sa2 { 166struct sadb_x_sa2 {
167 uint16_t sadb_x_sa2_len; 167 __u16 sadb_x_sa2_len;
168 uint16_t sadb_x_sa2_exttype; 168 __u16 sadb_x_sa2_exttype;
169 uint8_t sadb_x_sa2_mode; 169 __u8 sadb_x_sa2_mode;
170 uint8_t sadb_x_sa2_reserved1; 170 __u8 sadb_x_sa2_reserved1;
171 uint16_t sadb_x_sa2_reserved2; 171 __u16 sadb_x_sa2_reserved2;
172 uint32_t sadb_x_sa2_sequence; 172 __u32 sadb_x_sa2_sequence;
173 uint32_t sadb_x_sa2_reqid; 173 __u32 sadb_x_sa2_reqid;
174} __attribute__((packed)); 174} __attribute__((packed));
175/* sizeof(struct sadb_x_sa2) == 16 */ 175/* sizeof(struct sadb_x_sa2) == 16 */
176 176
177struct sadb_x_policy { 177struct sadb_x_policy {
178 uint16_t sadb_x_policy_len; 178 __u16 sadb_x_policy_len;
179 uint16_t sadb_x_policy_exttype; 179 __u16 sadb_x_policy_exttype;
180 uint16_t sadb_x_policy_type; 180 __u16 sadb_x_policy_type;
181 uint8_t sadb_x_policy_dir; 181 __u8 sadb_x_policy_dir;
182 uint8_t sadb_x_policy_reserved; 182 __u8 sadb_x_policy_reserved;
183 uint32_t sadb_x_policy_id; 183 __u32 sadb_x_policy_id;
184 uint32_t sadb_x_policy_priority; 184 __u32 sadb_x_policy_priority;
185} __attribute__((packed)); 185} __attribute__((packed));
186/* sizeof(struct sadb_x_policy) == 16 */ 186/* sizeof(struct sadb_x_policy) == 16 */
187 187
188struct sadb_x_ipsecrequest { 188struct sadb_x_ipsecrequest {
189 uint16_t sadb_x_ipsecrequest_len; 189 __u16 sadb_x_ipsecrequest_len;
190 uint16_t sadb_x_ipsecrequest_proto; 190 __u16 sadb_x_ipsecrequest_proto;
191 uint8_t sadb_x_ipsecrequest_mode; 191 __u8 sadb_x_ipsecrequest_mode;
192 uint8_t sadb_x_ipsecrequest_level; 192 __u8 sadb_x_ipsecrequest_level;
193 uint16_t sadb_x_ipsecrequest_reserved1; 193 __u16 sadb_x_ipsecrequest_reserved1;
194 uint32_t sadb_x_ipsecrequest_reqid; 194 __u32 sadb_x_ipsecrequest_reqid;
195 uint32_t sadb_x_ipsecrequest_reserved2; 195 __u32 sadb_x_ipsecrequest_reserved2;
196} __attribute__((packed)); 196} __attribute__((packed));
197/* sizeof(struct sadb_x_ipsecrequest) == 16 */ 197/* sizeof(struct sadb_x_ipsecrequest) == 16 */
198 198
@@ -200,38 +200,38 @@ struct sadb_x_ipsecrequest {
200 * type of NAT-T is supported, draft-ietf-ipsec-udp-encaps-06 200 * type of NAT-T is supported, draft-ietf-ipsec-udp-encaps-06
201 */ 201 */
202struct sadb_x_nat_t_type { 202struct sadb_x_nat_t_type {
203 uint16_t sadb_x_nat_t_type_len; 203 __u16 sadb_x_nat_t_type_len;
204 uint16_t sadb_x_nat_t_type_exttype; 204 __u16 sadb_x_nat_t_type_exttype;
205 uint8_t sadb_x_nat_t_type_type; 205 __u8 sadb_x_nat_t_type_type;
206 uint8_t sadb_x_nat_t_type_reserved[3]; 206 __u8 sadb_x_nat_t_type_reserved[3];
207} __attribute__((packed)); 207} __attribute__((packed));
208/* sizeof(struct sadb_x_nat_t_type) == 8 */ 208/* sizeof(struct sadb_x_nat_t_type) == 8 */
209 209
210/* Pass a NAT Traversal port (Source or Dest port) */ 210/* Pass a NAT Traversal port (Source or Dest port) */
211struct sadb_x_nat_t_port { 211struct sadb_x_nat_t_port {
212 uint16_t sadb_x_nat_t_port_len; 212 __u16 sadb_x_nat_t_port_len;
213 uint16_t sadb_x_nat_t_port_exttype; 213 __u16 sadb_x_nat_t_port_exttype;
214 __be16 sadb_x_nat_t_port_port; 214 __be16 sadb_x_nat_t_port_port;
215 uint16_t sadb_x_nat_t_port_reserved; 215 __u16 sadb_x_nat_t_port_reserved;
216} __attribute__((packed)); 216} __attribute__((packed));
217/* sizeof(struct sadb_x_nat_t_port) == 8 */ 217/* sizeof(struct sadb_x_nat_t_port) == 8 */
218 218
219/* Generic LSM security context */ 219/* Generic LSM security context */
220struct sadb_x_sec_ctx { 220struct sadb_x_sec_ctx {
221 uint16_t sadb_x_sec_len; 221 __u16 sadb_x_sec_len;
222 uint16_t sadb_x_sec_exttype; 222 __u16 sadb_x_sec_exttype;
223 uint8_t sadb_x_ctx_alg; /* LSMs: e.g., selinux == 1 */ 223 __u8 sadb_x_ctx_alg; /* LSMs: e.g., selinux == 1 */
224 uint8_t sadb_x_ctx_doi; 224 __u8 sadb_x_ctx_doi;
225 uint16_t sadb_x_ctx_len; 225 __u16 sadb_x_ctx_len;
226} __attribute__((packed)); 226} __attribute__((packed));
227/* sizeof(struct sadb_sec_ctx) = 8 */ 227/* sizeof(struct sadb_sec_ctx) = 8 */
228 228
229/* Used by MIGRATE to pass addresses IKE will use to perform 229/* Used by MIGRATE to pass addresses IKE will use to perform
230 * negotiation with the peer */ 230 * negotiation with the peer */
231struct sadb_x_kmaddress { 231struct sadb_x_kmaddress {
232 uint16_t sadb_x_kmaddress_len; 232 __u16 sadb_x_kmaddress_len;
233 uint16_t sadb_x_kmaddress_exttype; 233 __u16 sadb_x_kmaddress_exttype;
234 uint32_t sadb_x_kmaddress_reserved; 234 __u32 sadb_x_kmaddress_reserved;
235} __attribute__((packed)); 235} __attribute__((packed));
236/* sizeof(struct sadb_x_kmaddress) == 8 */ 236/* sizeof(struct sadb_x_kmaddress) == 8 */
237 237
diff --git a/include/linux/selinux_netlink.h b/include/linux/selinux_netlink.h
index bbf489decd84..d239797785cf 100644
--- a/include/linux/selinux_netlink.h
+++ b/include/linux/selinux_netlink.h
@@ -12,6 +12,8 @@
12#ifndef _LINUX_SELINUX_NETLINK_H 12#ifndef _LINUX_SELINUX_NETLINK_H
13#define _LINUX_SELINUX_NETLINK_H 13#define _LINUX_SELINUX_NETLINK_H
14 14
15#include <linux/types.h>
16
15/* Message types. */ 17/* Message types. */
16#define SELNL_MSG_BASE 0x10 18#define SELNL_MSG_BASE 0x10
17enum { 19enum {
@@ -38,11 +40,11 @@ enum selinux_nlgroups {
38 40
39/* Message structures */ 41/* Message structures */
40struct selnl_msg_setenforce { 42struct selnl_msg_setenforce {
41 int32_t val; 43 __s32 val;
42}; 44};
43 45
44struct selnl_msg_policyload { 46struct selnl_msg_policyload {
45 u_int32_t seqno; 47 __u32 seqno;
46}; 48};
47 49
48#endif /* _LINUX_SELINUX_NETLINK_H */ 50#endif /* _LINUX_SELINUX_NETLINK_H */
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 16684c5a608c..d9beda5f74a7 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -23,9 +23,10 @@
23#ifndef __SOUND_ASOUND_H 23#ifndef __SOUND_ASOUND_H
24#define __SOUND_ASOUND_H 24#define __SOUND_ASOUND_H
25 25
26#include <linux/types.h>
27
26#ifdef __KERNEL__ 28#ifdef __KERNEL__
27#include <linux/ioctl.h> 29#include <linux/ioctl.h>
28#include <linux/types.h>
29#include <linux/time.h> 30#include <linux/time.h>
30#include <asm/byteorder.h> 31#include <asm/byteorder.h>
31 32
@@ -342,7 +343,7 @@ struct snd_interval {
342#define SNDRV_MASK_MAX 256 343#define SNDRV_MASK_MAX 256
343 344
344struct snd_mask { 345struct snd_mask {
345 u_int32_t bits[(SNDRV_MASK_MAX+31)/32]; 346 __u32 bits[(SNDRV_MASK_MAX+31)/32];
346}; 347};
347 348
348struct snd_pcm_hw_params { 349struct snd_pcm_hw_params {
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 10ee28eac018..c380056ff26d 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1,6 +1,8 @@
1#ifndef __SOUND_EMU10K1_H 1#ifndef __SOUND_EMU10K1_H
2#define __SOUND_EMU10K1_H 2#define __SOUND_EMU10K1_H
3 3
4#include <linux/types.h>
5
4/* 6/*
5 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>, 7 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
6 * Creative Labs, Inc. 8 * Creative Labs, Inc.
@@ -34,6 +36,8 @@
34#include <sound/timer.h> 36#include <sound/timer.h>
35#include <linux/interrupt.h> 37#include <linux/interrupt.h>
36#include <linux/mutex.h> 38#include <linux/mutex.h>
39#include <linux/types.h>
40
37#include <asm/io.h> 41#include <asm/io.h>
38 42
39/* ------------------- DEFINES -------------------- */ 43/* ------------------- DEFINES -------------------- */
@@ -2171,7 +2175,7 @@ struct snd_emu10k1_fx8010_code {
2171 char name[128]; 2175 char name[128];
2172 2176
2173 DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ 2177 DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
2174 u_int32_t __user *gpr_map; /* initializers */ 2178 __u32 __user *gpr_map; /* initializers */
2175 2179
2176 unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ 2180 unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */
2177 struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */ 2181 struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */
@@ -2184,11 +2188,11 @@ struct snd_emu10k1_fx8010_code {
2184 struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */ 2188 struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */
2185 2189
2186 DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ 2190 DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
2187 u_int32_t __user *tram_data_map; /* data initializers */ 2191 __u32 __user *tram_data_map; /* data initializers */
2188 u_int32_t __user *tram_addr_map; /* map initializers */ 2192 __u32 __user *tram_addr_map; /* map initializers */
2189 2193
2190 DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ 2194 DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
2191 u_int32_t __user *code; /* one instruction - 64 bits */ 2195 __u32 __user *code; /* one instruction - 64 bits */
2192}; 2196};
2193 2197
2194struct snd_emu10k1_fx8010_tram { 2198struct snd_emu10k1_fx8010_tram {
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-12 19:25:25 -0500