diff options
-rw-r--r-- | include/asm-generic/fcntl.h | 12 | ||||
-rw-r--r-- | include/asm-generic/siginfo.h | 14 | ||||
-rw-r--r-- | include/linux/agpgart.h | 14 | ||||
-rw-r--r-- | include/linux/cn_proc.h | 20 | ||||
-rw-r--r-- | include/linux/cyclades.h | 6 | ||||
-rw-r--r-- | include/linux/dvb/video.h | 2 | ||||
-rw-r--r-- | include/linux/if_pppol2tp.h | 2 | ||||
-rw-r--r-- | include/linux/mroute6.h | 2 | ||||
-rw-r--r-- | include/linux/netfilter_ipv4/ipt_owner.h | 8 | ||||
-rw-r--r-- | include/linux/netfilter_ipv6/ip6t_owner.h | 8 | ||||
-rw-r--r-- | include/linux/ppp_defs.h | 4 | ||||
-rw-r--r-- | include/linux/suspend_ioctls.h | 11 | ||||
-rw-r--r-- | include/linux/time.h | 8 | ||||
-rw-r--r-- | include/linux/times.h | 8 | ||||
-rw-r--r-- | include/linux/utime.h | 4 | ||||
-rw-r--r-- | include/linux/xfrm.h | 2 | ||||
-rw-r--r-- | include/mtd/mtd-abi.h | 4 | ||||
-rw-r--r-- | include/sound/asound.h | 4 |
18 files changed, 67 insertions, 66 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index b8477414c5c8..4d3e48373e74 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h | |||
@@ -117,9 +117,9 @@ | |||
117 | struct flock { | 117 | struct flock { |
118 | short l_type; | 118 | short l_type; |
119 | short l_whence; | 119 | short l_whence; |
120 | off_t l_start; | 120 | __kernel_off_t l_start; |
121 | off_t l_len; | 121 | __kernel_off_t l_len; |
122 | pid_t l_pid; | 122 | __kernel_pid_t l_pid; |
123 | __ARCH_FLOCK_PAD | 123 | __ARCH_FLOCK_PAD |
124 | }; | 124 | }; |
125 | #endif | 125 | #endif |
@@ -140,9 +140,9 @@ struct flock { | |||
140 | struct flock64 { | 140 | struct flock64 { |
141 | short l_type; | 141 | short l_type; |
142 | short l_whence; | 142 | short l_whence; |
143 | loff_t l_start; | 143 | __kernel_loff_t l_start; |
144 | loff_t l_len; | 144 | __kernel_loff_t l_len; |
145 | pid_t l_pid; | 145 | __kernel_pid_t l_pid; |
146 | __ARCH_FLOCK64_PAD | 146 | __ARCH_FLOCK64_PAD |
147 | }; | 147 | }; |
148 | #endif | 148 | #endif |
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h index 969570167e9e..35752dadd6df 100644 --- a/include/asm-generic/siginfo.h +++ b/include/asm-generic/siginfo.h | |||
@@ -23,7 +23,7 @@ typedef union sigval { | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #ifndef __ARCH_SI_UID_T | 25 | #ifndef __ARCH_SI_UID_T |
26 | #define __ARCH_SI_UID_T uid_t | 26 | #define __ARCH_SI_UID_T __kernel_uid32_t |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* | 29 | /* |
@@ -47,13 +47,13 @@ typedef struct siginfo { | |||
47 | 47 | ||
48 | /* kill() */ | 48 | /* kill() */ |
49 | struct { | 49 | struct { |
50 | pid_t _pid; /* sender's pid */ | 50 | __kernel_pid_t _pid; /* sender's pid */ |
51 | __ARCH_SI_UID_T _uid; /* sender's uid */ | 51 | __ARCH_SI_UID_T _uid; /* sender's uid */ |
52 | } _kill; | 52 | } _kill; |
53 | 53 | ||
54 | /* POSIX.1b timers */ | 54 | /* POSIX.1b timers */ |
55 | struct { | 55 | struct { |
56 | timer_t _tid; /* timer id */ | 56 | __kernel_timer_t _tid; /* timer id */ |
57 | int _overrun; /* overrun count */ | 57 | int _overrun; /* overrun count */ |
58 | char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)]; | 58 | char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)]; |
59 | sigval_t _sigval; /* same as below */ | 59 | sigval_t _sigval; /* same as below */ |
@@ -62,18 +62,18 @@ typedef struct siginfo { | |||
62 | 62 | ||
63 | /* POSIX.1b signals */ | 63 | /* POSIX.1b signals */ |
64 | struct { | 64 | struct { |
65 | pid_t _pid; /* sender's pid */ | 65 | __kernel_pid_t _pid; /* sender's pid */ |
66 | __ARCH_SI_UID_T _uid; /* sender's uid */ | 66 | __ARCH_SI_UID_T _uid; /* sender's uid */ |
67 | sigval_t _sigval; | 67 | sigval_t _sigval; |
68 | } _rt; | 68 | } _rt; |
69 | 69 | ||
70 | /* SIGCHLD */ | 70 | /* SIGCHLD */ |
71 | struct { | 71 | struct { |
72 | pid_t _pid; /* which child */ | 72 | __kernel_pid_t _pid; /* which child */ |
73 | __ARCH_SI_UID_T _uid; /* sender's uid */ | 73 | __ARCH_SI_UID_T _uid; /* sender's uid */ |
74 | int _status; /* exit code */ | 74 | int _status; /* exit code */ |
75 | clock_t _utime; | 75 | __kernel_clock_t _utime; |
76 | clock_t _stime; | 76 | __kernel_clock_t _stime; |
77 | } _sigchld; | 77 | } _sigchld; |
78 | 78 | ||
79 | /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ | 79 | /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ |
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index 110c600c885f..f6778eceb8f4 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
@@ -77,20 +77,20 @@ typedef struct _agp_setup { | |||
77 | * The "prot" down below needs still a "sleep" flag somehow ... | 77 | * The "prot" down below needs still a "sleep" flag somehow ... |
78 | */ | 78 | */ |
79 | typedef struct _agp_segment { | 79 | typedef struct _agp_segment { |
80 | off_t pg_start; /* starting page to populate */ | 80 | __kernel_off_t pg_start; /* starting page to populate */ |
81 | size_t pg_count; /* number of pages */ | 81 | __kernel_size_t pg_count; /* number of pages */ |
82 | int prot; /* prot flags for mmap */ | 82 | int prot; /* prot flags for mmap */ |
83 | } agp_segment; | 83 | } agp_segment; |
84 | 84 | ||
85 | typedef struct _agp_region { | 85 | typedef struct _agp_region { |
86 | pid_t pid; /* pid of process */ | 86 | __kernel_pid_t pid; /* pid of process */ |
87 | size_t seg_count; /* number of segments */ | 87 | __kernel_size_t seg_count; /* number of segments */ |
88 | struct _agp_segment *seg_list; | 88 | struct _agp_segment *seg_list; |
89 | } agp_region; | 89 | } agp_region; |
90 | 90 | ||
91 | typedef struct _agp_allocate { | 91 | typedef struct _agp_allocate { |
92 | int key; /* tag of allocation */ | 92 | int key; /* tag of allocation */ |
93 | size_t pg_count; /* number of pages */ | 93 | __kernel_size_t pg_count;/* number of pages */ |
94 | __u32 type; /* 0 == normal, other devspec */ | 94 | __u32 type; /* 0 == normal, other devspec */ |
95 | __u32 physical; /* device specific (some devices | 95 | __u32 physical; /* device specific (some devices |
96 | * need a phys address of the | 96 | * need a phys address of the |
@@ -100,7 +100,7 @@ typedef struct _agp_allocate { | |||
100 | 100 | ||
101 | typedef struct _agp_bind { | 101 | typedef struct _agp_bind { |
102 | int key; /* tag of allocation */ | 102 | int key; /* tag of allocation */ |
103 | off_t pg_start; /* starting page to populate */ | 103 | __kernel_off_t pg_start;/* starting page to populate */ |
104 | } agp_bind; | 104 | } agp_bind; |
105 | 105 | ||
106 | typedef struct _agp_unbind { | 106 | typedef struct _agp_unbind { |
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h index 1c86d65bc4b9..b8125b2eb665 100644 --- a/include/linux/cn_proc.h +++ b/include/linux/cn_proc.h | |||
@@ -65,20 +65,20 @@ struct proc_event { | |||
65 | } ack; | 65 | } ack; |
66 | 66 | ||
67 | struct fork_proc_event { | 67 | struct fork_proc_event { |
68 | pid_t parent_pid; | 68 | __kernel_pid_t parent_pid; |
69 | pid_t parent_tgid; | 69 | __kernel_pid_t parent_tgid; |
70 | pid_t child_pid; | 70 | __kernel_pid_t child_pid; |
71 | pid_t child_tgid; | 71 | __kernel_pid_t child_tgid; |
72 | } fork; | 72 | } fork; |
73 | 73 | ||
74 | struct exec_proc_event { | 74 | struct exec_proc_event { |
75 | pid_t process_pid; | 75 | __kernel_pid_t process_pid; |
76 | pid_t process_tgid; | 76 | __kernel_pid_t process_tgid; |
77 | } exec; | 77 | } exec; |
78 | 78 | ||
79 | struct id_proc_event { | 79 | struct id_proc_event { |
80 | pid_t process_pid; | 80 | __kernel_pid_t process_pid; |
81 | pid_t process_tgid; | 81 | __kernel_pid_t process_tgid; |
82 | union { | 82 | union { |
83 | __u32 ruid; /* task uid */ | 83 | __u32 ruid; /* task uid */ |
84 | __u32 rgid; /* task gid */ | 84 | __u32 rgid; /* task gid */ |
@@ -90,8 +90,8 @@ struct proc_event { | |||
90 | } id; | 90 | } id; |
91 | 91 | ||
92 | struct exit_proc_event { | 92 | struct exit_proc_event { |
93 | pid_t process_pid; | 93 | __kernel_pid_t process_pid; |
94 | pid_t process_tgid; | 94 | __kernel_pid_t process_tgid; |
95 | __u32 exit_code, exit_signal; | 95 | __u32 exit_code, exit_signal; |
96 | } exit; | 96 | } exit; |
97 | } event_data; | 97 | } event_data; |
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index d06fbf286346..788850ba4e75 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h | |||
@@ -82,9 +82,9 @@ struct cyclades_monitor { | |||
82 | * open) | 82 | * open) |
83 | */ | 83 | */ |
84 | struct cyclades_idle_stats { | 84 | struct cyclades_idle_stats { |
85 | time_t in_use; /* Time device has been in use (secs) */ | 85 | __kernel_time_t in_use; /* Time device has been in use (secs) */ |
86 | time_t recv_idle; /* Time since last char received (secs) */ | 86 | __kernel_time_t recv_idle; /* Time since last char received (secs) */ |
87 | time_t xmit_idle; /* Time since last char transmitted (secs) */ | 87 | __kernel_time_t xmit_idle; /* Time since last char transmitted (secs) */ |
88 | unsigned long recv_bytes; /* Bytes received */ | 88 | unsigned long recv_bytes; /* Bytes received */ |
89 | unsigned long xmit_bytes; /* Bytes transmitted */ | 89 | unsigned long xmit_bytes; /* Bytes transmitted */ |
90 | unsigned long overruns; /* Input overruns */ | 90 | unsigned long overruns; /* Input overruns */ |
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h index bd49c3ebf916..ee5d2df2d78d 100644 --- a/include/linux/dvb/video.h +++ b/include/linux/dvb/video.h | |||
@@ -137,7 +137,7 @@ struct video_event { | |||
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 |
139 | #define VIDEO_EVENT_VSYNC 4 | 139 | #define VIDEO_EVENT_VSYNC 4 |
140 | time_t timestamp; | 140 | __kernel_time_t timestamp; |
141 | union { | 141 | union { |
142 | video_size_t size; | 142 | video_size_t size; |
143 | unsigned int frame_rate; /* in frames per 1000sec */ | 143 | unsigned int frame_rate; /* in frames per 1000sec */ |
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h index c7a66882b6d0..3a14b088c8ec 100644 --- a/include/linux/if_pppol2tp.h +++ b/include/linux/if_pppol2tp.h | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | struct pppol2tp_addr | 27 | struct pppol2tp_addr |
28 | { | 28 | { |
29 | pid_t pid; /* pid that owns the fd. | 29 | __kernel_pid_t pid; /* pid that owns the fd. |
30 | * 0 => current */ | 30 | * 0 => current */ |
31 | int fd; /* FD of UDP socket to use */ | 31 | int fd; /* FD of UDP socket to use */ |
32 | 32 | ||
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 5375faca1f72..43dc97e32183 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h | |||
@@ -65,7 +65,7 @@ struct mif6ctl { | |||
65 | mifi_t mif6c_mifi; /* Index of MIF */ | 65 | mifi_t mif6c_mifi; /* Index of MIF */ |
66 | unsigned char mif6c_flags; /* MIFF_ flags */ | 66 | unsigned char mif6c_flags; /* MIFF_ flags */ |
67 | unsigned char vifc_threshold; /* ttl limit */ | 67 | unsigned char vifc_threshold; /* ttl limit */ |
68 | u_short mif6c_pifi; /* the index of the physical IF */ | 68 | __u16 mif6c_pifi; /* the index of the physical IF */ |
69 | unsigned int vifc_rate_limit; /* Rate limiter values (NI) */ | 69 | unsigned int vifc_rate_limit; /* Rate limiter values (NI) */ |
70 | }; | 70 | }; |
71 | 71 | ||
diff --git a/include/linux/netfilter_ipv4/ipt_owner.h b/include/linux/netfilter_ipv4/ipt_owner.h index 92f4bdac54ef..a78445be9992 100644 --- a/include/linux/netfilter_ipv4/ipt_owner.h +++ b/include/linux/netfilter_ipv4/ipt_owner.h | |||
@@ -9,10 +9,10 @@ | |||
9 | #define IPT_OWNER_COMM 0x10 | 9 | #define IPT_OWNER_COMM 0x10 |
10 | 10 | ||
11 | struct ipt_owner_info { | 11 | struct ipt_owner_info { |
12 | uid_t uid; | 12 | __kernel_uid32_t uid; |
13 | gid_t gid; | 13 | __kernel_gid32_t gid; |
14 | pid_t pid; | 14 | __kernel_pid_t pid; |
15 | pid_t sid; | 15 | __kernel_pid_t sid; |
16 | char comm[16]; | 16 | char comm[16]; |
17 | u_int8_t match, invert; /* flags */ | 17 | u_int8_t match, invert; /* flags */ |
18 | }; | 18 | }; |
diff --git a/include/linux/netfilter_ipv6/ip6t_owner.h b/include/linux/netfilter_ipv6/ip6t_owner.h index 19937da3d101..ec5cc7a38c42 100644 --- a/include/linux/netfilter_ipv6/ip6t_owner.h +++ b/include/linux/netfilter_ipv6/ip6t_owner.h | |||
@@ -8,10 +8,10 @@ | |||
8 | #define IP6T_OWNER_SID 0x08 | 8 | #define IP6T_OWNER_SID 0x08 |
9 | 9 | ||
10 | struct ip6t_owner_info { | 10 | struct ip6t_owner_info { |
11 | uid_t uid; | 11 | __kernel_uid32_t uid; |
12 | gid_t gid; | 12 | __kernel_gid32_t gid; |
13 | pid_t pid; | 13 | __kernel_pid_t pid; |
14 | pid_t sid; | 14 | __kernel_pid_t sid; |
15 | u_int8_t match, invert; /* flags */ | 15 | u_int8_t match, invert; /* flags */ |
16 | }; | 16 | }; |
17 | 17 | ||
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 1c866bda2018..0f93ed6b4a88 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h | |||
@@ -177,8 +177,8 @@ struct ppp_comp_stats { | |||
177 | * the last NP packet was sent or received. | 177 | * the last NP packet was sent or received. |
178 | */ | 178 | */ |
179 | struct ppp_idle { | 179 | struct ppp_idle { |
180 | time_t xmit_idle; /* time since last NP packet sent */ | 180 | __kernel_time_t xmit_idle; /* time since last NP packet sent */ |
181 | time_t recv_idle; /* time since last NP packet received */ | 181 | __kernel_time_t recv_idle; /* time since last NP packet received */ |
182 | }; | 182 | }; |
183 | 183 | ||
184 | #endif /* _PPP_DEFS_H_ */ | 184 | #endif /* _PPP_DEFS_H_ */ |
diff --git a/include/linux/suspend_ioctls.h b/include/linux/suspend_ioctls.h index 2c6faec96bde..0b30382984fe 100644 --- a/include/linux/suspend_ioctls.h +++ b/include/linux/suspend_ioctls.h | |||
@@ -1,14 +1,15 @@ | |||
1 | #ifndef _LINUX_SUSPEND_IOCTLS_H | 1 | #ifndef _LINUX_SUSPEND_IOCTLS_H |
2 | #define _LINUX_SUSPEND_IOCTLS_H | 2 | #define _LINUX_SUSPEND_IOCTLS_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | /* | 5 | /* |
5 | * This structure is used to pass the values needed for the identification | 6 | * This structure is used to pass the values needed for the identification |
6 | * of the resume swap area from a user space to the kernel via the | 7 | * of the resume swap area from a user space to the kernel via the |
7 | * SNAPSHOT_SET_SWAP_AREA ioctl | 8 | * SNAPSHOT_SET_SWAP_AREA ioctl |
8 | */ | 9 | */ |
9 | struct resume_swap_area { | 10 | struct resume_swap_area { |
10 | loff_t offset; | 11 | __kernel_loff_t offset; |
11 | u_int32_t dev; | 12 | __u32 dev; |
12 | } __attribute__((packed)); | 13 | } __attribute__((packed)); |
13 | 14 | ||
14 | #define SNAPSHOT_IOC_MAGIC '3' | 15 | #define SNAPSHOT_IOC_MAGIC '3' |
@@ -20,13 +21,13 @@ struct resume_swap_area { | |||
20 | #define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11) | 21 | #define SNAPSHOT_S2RAM _IO(SNAPSHOT_IOC_MAGIC, 11) |
21 | #define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \ | 22 | #define SNAPSHOT_SET_SWAP_AREA _IOW(SNAPSHOT_IOC_MAGIC, 13, \ |
22 | struct resume_swap_area) | 23 | struct resume_swap_area) |
23 | #define SNAPSHOT_GET_IMAGE_SIZE _IOR(SNAPSHOT_IOC_MAGIC, 14, loff_t) | 24 | #define SNAPSHOT_GET_IMAGE_SIZE _IOR(SNAPSHOT_IOC_MAGIC, 14, __kernel_loff_t) |
24 | #define SNAPSHOT_PLATFORM_SUPPORT _IO(SNAPSHOT_IOC_MAGIC, 15) | 25 | #define SNAPSHOT_PLATFORM_SUPPORT _IO(SNAPSHOT_IOC_MAGIC, 15) |
25 | #define SNAPSHOT_POWER_OFF _IO(SNAPSHOT_IOC_MAGIC, 16) | 26 | #define SNAPSHOT_POWER_OFF _IO(SNAPSHOT_IOC_MAGIC, 16) |
26 | #define SNAPSHOT_CREATE_IMAGE _IOW(SNAPSHOT_IOC_MAGIC, 17, int) | 27 | #define SNAPSHOT_CREATE_IMAGE _IOW(SNAPSHOT_IOC_MAGIC, 17, int) |
27 | #define SNAPSHOT_PREF_IMAGE_SIZE _IO(SNAPSHOT_IOC_MAGIC, 18) | 28 | #define SNAPSHOT_PREF_IMAGE_SIZE _IO(SNAPSHOT_IOC_MAGIC, 18) |
28 | #define SNAPSHOT_AVAIL_SWAP_SIZE _IOR(SNAPSHOT_IOC_MAGIC, 19, loff_t) | 29 | #define SNAPSHOT_AVAIL_SWAP_SIZE _IOR(SNAPSHOT_IOC_MAGIC, 19, __kernel_loff_t) |
29 | #define SNAPSHOT_ALLOC_SWAP_PAGE _IOR(SNAPSHOT_IOC_MAGIC, 20, loff_t) | 30 | #define SNAPSHOT_ALLOC_SWAP_PAGE _IOR(SNAPSHOT_IOC_MAGIC, 20, __kernel_loff_t) |
30 | #define SNAPSHOT_IOC_MAXNR 20 | 31 | #define SNAPSHOT_IOC_MAXNR 20 |
31 | 32 | ||
32 | #endif /* _LINUX_SUSPEND_IOCTLS_H */ | 33 | #endif /* _LINUX_SUSPEND_IOCTLS_H */ |
diff --git a/include/linux/time.h b/include/linux/time.h index fbbd2a1c92ba..242f62499bb7 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -12,14 +12,14 @@ | |||
12 | #ifndef _STRUCT_TIMESPEC | 12 | #ifndef _STRUCT_TIMESPEC |
13 | #define _STRUCT_TIMESPEC | 13 | #define _STRUCT_TIMESPEC |
14 | struct timespec { | 14 | struct timespec { |
15 | time_t tv_sec; /* seconds */ | 15 | __kernel_time_t tv_sec; /* seconds */ |
16 | long tv_nsec; /* nanoseconds */ | 16 | long tv_nsec; /* nanoseconds */ |
17 | }; | 17 | }; |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | struct timeval { | 20 | struct timeval { |
21 | time_t tv_sec; /* seconds */ | 21 | __kernel_time_t tv_sec; /* seconds */ |
22 | suseconds_t tv_usec; /* microseconds */ | 22 | __kernel_suseconds_t tv_usec; /* microseconds */ |
23 | }; | 23 | }; |
24 | 24 | ||
25 | struct timezone { | 25 | struct timezone { |
diff --git a/include/linux/times.h b/include/linux/times.h index e2d3020742a6..87b62615cedd 100644 --- a/include/linux/times.h +++ b/include/linux/times.h | |||
@@ -4,10 +4,10 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | 5 | ||
6 | struct tms { | 6 | struct tms { |
7 | clock_t tms_utime; | 7 | __kernel_clock_t tms_utime; |
8 | clock_t tms_stime; | 8 | __kernel_clock_t tms_stime; |
9 | clock_t tms_cutime; | 9 | __kernel_clock_t tms_cutime; |
10 | clock_t tms_cstime; | 10 | __kernel_clock_t tms_cstime; |
11 | }; | 11 | }; |
12 | 12 | ||
13 | #endif | 13 | #endif |
diff --git a/include/linux/utime.h b/include/linux/utime.h index 640be6a1959e..5cdf673afbdb 100644 --- a/include/linux/utime.h +++ b/include/linux/utime.h | |||
@@ -4,8 +4,8 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | 5 | ||
6 | struct utimbuf { | 6 | struct utimbuf { |
7 | time_t actime; | 7 | __kernel_time_t actime; |
8 | time_t modtime; | 8 | __kernel_time_t modtime; |
9 | }; | 9 | }; |
10 | 10 | ||
11 | #endif | 11 | #endif |
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 52f3abd453a1..2d4ec15abaca 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h | |||
@@ -58,7 +58,7 @@ struct xfrm_selector | |||
58 | __u8 prefixlen_s; | 58 | __u8 prefixlen_s; |
59 | __u8 proto; | 59 | __u8 proto; |
60 | int ifindex; | 60 | int ifindex; |
61 | uid_t user; | 61 | __kernel_uid32_t user; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | #define XFRM_INF (~(__u64)0) | 64 | #define XFRM_INF (~(__u64)0) |
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h index c6c61cd5a254..fb672013299c 100644 --- a/include/mtd/mtd-abi.h +++ b/include/mtd/mtd-abi.h | |||
@@ -84,8 +84,8 @@ struct otp_info { | |||
84 | #define MEMGETREGIONINFO _IOWR('M', 8, struct region_info_user) | 84 | #define MEMGETREGIONINFO _IOWR('M', 8, struct region_info_user) |
85 | #define MEMSETOOBSEL _IOW('M', 9, struct nand_oobinfo) | 85 | #define MEMSETOOBSEL _IOW('M', 9, struct nand_oobinfo) |
86 | #define MEMGETOOBSEL _IOR('M', 10, struct nand_oobinfo) | 86 | #define MEMGETOOBSEL _IOR('M', 10, struct nand_oobinfo) |
87 | #define MEMGETBADBLOCK _IOW('M', 11, loff_t) | 87 | #define MEMGETBADBLOCK _IOW('M', 11, __kernel_loff_t) |
88 | #define MEMSETBADBLOCK _IOW('M', 12, loff_t) | 88 | #define MEMSETBADBLOCK _IOW('M', 12, __kernel_loff_t) |
89 | #define OTPSELECT _IOR('M', 13, int) | 89 | #define OTPSELECT _IOR('M', 13, int) |
90 | #define OTPGETREGIONCOUNT _IOW('M', 14, int) | 90 | #define OTPGETREGIONCOUNT _IOW('M', 14, int) |
91 | #define OTPGETREGIONINFO _IOW('M', 15, struct otp_info) | 91 | #define OTPGETREGIONINFO _IOW('M', 15, struct otp_info) |
diff --git a/include/sound/asound.h b/include/sound/asound.h index 1c02ed1d7c4a..16684c5a608c 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h | |||
@@ -385,7 +385,7 @@ struct snd_pcm_sw_params { | |||
385 | 385 | ||
386 | struct snd_pcm_channel_info { | 386 | struct snd_pcm_channel_info { |
387 | unsigned int channel; | 387 | unsigned int channel; |
388 | off_t offset; /* mmap offset */ | 388 | __kernel_off_t offset; /* mmap offset */ |
389 | unsigned int first; /* offset to first sample in bits */ | 389 | unsigned int first; /* offset to first sample in bits */ |
390 | unsigned int step; /* samples distance in bits */ | 390 | unsigned int step; /* samples distance in bits */ |
391 | }; | 391 | }; |
@@ -789,7 +789,7 @@ struct snd_ctl_elem_info { | |||
789 | snd_ctl_elem_type_t type; /* R: value type - SNDRV_CTL_ELEM_TYPE_* */ | 789 | snd_ctl_elem_type_t type; /* R: value type - SNDRV_CTL_ELEM_TYPE_* */ |
790 | unsigned int access; /* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */ | 790 | unsigned int access; /* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */ |
791 | unsigned int count; /* count of values */ | 791 | unsigned int count; /* count of values */ |
792 | pid_t owner; /* owner's PID of this control */ | 792 | __kernel_pid_t owner; /* owner's PID of this control */ |
793 | union { | 793 | union { |
794 | struct { | 794 | struct { |
795 | long min; /* R: minimum value */ | 795 | long min; /* R: minimum value */ |