]> code.ossystems Code Review - openembedded-core.git/blob
02064f268700898e9efd1d07c06a8eceaf40159c
[openembedded-core.git] /
1 Upstream-Status: Backport
2
3 From 716c93ecf8edc5dda092d4fa4d878f333a601b51 Mon Sep 17 00:00:00 2001
4 From: "Dmitry V. Levin" <ldv@altlinux.org>
5 Date: Mon, 12 Nov 2012 14:04:46 +0000
6 Subject: [PATCH 30/31] Move asm-generic ioctl definitions to
7  linux/ioctlent.h.in
8
9 * linux/ioctlent.h.in: Add asm-generic ioctl entries from all
10 linux/*/ioctlent.h.in files.
11 * linux/bfin/ioctlent.h.in: Remove asm-generic ioctl entries.
12 * linux/i386/ioctlent.h.in: Likewise.
13 * linux/powerpc/ioctlent.h.in: Likewise.
14 * linux/s390/ioctlent.h.in: Likewise.
15 * linux/sparc/ioctlent.h.in: Likewise.
16 ---
17  linux/bfin/ioctlent.h.in    | 78 -------------------------------------------
18  linux/i386/ioctlent.h.in    | 77 -------------------------------------------
19  linux/ioctlent.h.in         | 80 +++++++++++++++++++++++++++++++++++++++++++++
20  linux/powerpc/ioctlent.h.in | 30 -----------------
21  linux/s390/ioctlent.h.in    | 76 ------------------------------------------
22  linux/sparc/ioctlent.h.in   | 53 ------------------------------
23  6 files changed, 80 insertions(+), 314 deletions(-)
24
25 diff --git a/linux/bfin/ioctlent.h.in b/linux/bfin/ioctlent.h.in
26 index 3773544..791d8e3 100644
27 --- a/linux/bfin/ioctlent.h.in
28 +++ b/linux/bfin/ioctlent.h.in
29 @@ -1,86 +1,8 @@
30         {"asm/bfin_sport.h",    "SPORT_IOC_CONFIG",     0x5001},
31         {"asm/bfin_sport.h",    "SPORT_IOC_GET_SYSTEMCLOCK",    0x5002},
32         {"asm/bfin_sport.h",    "SPORT_IOC_SET_BAUDRATE",       0x5003},
33 -       {"asm-generic/ioctls.h",        "TCGETS",       0x5401},
34 -       {"asm-generic/ioctls.h",        "TCSETS",       0x5402},
35 -       {"asm-generic/ioctls.h",        "TCSETSW",      0x5403},
36 -       {"asm-generic/ioctls.h",        "TCSETSF",      0x5404},
37 -       {"asm-generic/ioctls.h",        "TCGETA",       0x5405},
38 -       {"asm-generic/ioctls.h",        "TCSETA",       0x5406},
39 -       {"asm-generic/ioctls.h",        "TCSETAW",      0x5407},
40 -       {"asm-generic/ioctls.h",        "TCSETAF",      0x5408},
41 -       {"asm-generic/ioctls.h",        "TCSBRK",       0x5409},
42 -       {"asm-generic/ioctls.h",        "TCXONC",       0x540a},
43 -       {"asm-generic/ioctls.h",        "TCFLSH",       0x540b},
44 -       {"asm-generic/ioctls.h",        "TIOCEXCL",     0x540c},
45 -       {"asm-generic/ioctls.h",        "TIOCNXCL",     0x540d},
46 -       {"asm-generic/ioctls.h",        "TIOCSCTTY",    0x540e},
47 -       {"asm-generic/ioctls.h",        "TIOCGPGRP",    0x540f},
48 -       {"asm-generic/ioctls.h",        "TIOCSPGRP",    0x5410},
49 -       {"asm-generic/ioctls.h",        "TIOCOUTQ",     0x5411},
50 -       {"asm-generic/ioctls.h",        "TIOCSTI",      0x5412},
51 -       {"asm-generic/ioctls.h",        "TIOCGWINSZ",   0x5413},
52 -       {"asm-generic/ioctls.h",        "TIOCSWINSZ",   0x5414},
53 -       {"asm-generic/ioctls.h",        "TIOCMGET",     0x5415},
54 -       {"asm-generic/ioctls.h",        "TIOCMBIS",     0x5416},
55 -       {"asm-generic/ioctls.h",        "TIOCMBIC",     0x5417},
56 -       {"asm-generic/ioctls.h",        "TIOCMSET",     0x5418},
57 -       {"asm-generic/ioctls.h",        "TIOCGSOFTCAR", 0x5419},
58 -       {"asm-generic/ioctls.h",        "TIOCSSOFTCAR", 0x541a},
59 -       {"asm-generic/ioctls.h",        "FIONREAD",     0x541b},
60 -       {"asm-generic/ioctls.h",        "TIOCLINUX",    0x541c},
61 -       {"asm-generic/ioctls.h",        "TIOCCONS",     0x541d},
62 -       {"asm-generic/ioctls.h",        "TIOCGSERIAL",  0x541e},
63 -       {"asm-generic/ioctls.h",        "TIOCSSERIAL",  0x541f},
64 -       {"asm-generic/ioctls.h",        "TIOCPKT",      0x5420},
65 -       {"asm-generic/ioctls.h",        "FIONBIO",      0x5421},
66 -       {"asm-generic/ioctls.h",        "TIOCNOTTY",    0x5422},
67 -       {"asm-generic/ioctls.h",        "TIOCSETD",     0x5423},
68 -       {"asm-generic/ioctls.h",        "TIOCGETD",     0x5424},
69 -       {"asm-generic/ioctls.h",        "TCSBRKP",      0x5425},
70 -       {"asm-generic/ioctls.h",        "TIOCTTYGSTRUCT",       0x5426},
71 -       {"asm-generic/ioctls.h",        "TIOCSBRK",     0x5427},
72 -       {"asm-generic/ioctls.h",        "TIOCCBRK",     0x5428},
73 -       {"asm-generic/ioctls.h",        "TIOCGSID",     0x5429},
74 -       {"asm-generic/ioctls.h",        "TCGETS2",      0x542a},
75 -       {"asm-generic/ioctls.h",        "TCSETS2",      0x542b},
76 -       {"asm-generic/ioctls.h",        "TCSETSW2",     0x542c},
77 -       {"asm-generic/ioctls.h",        "TCSETSF2",     0x542d},
78 -       {"asm-generic/ioctls.h",        "TIOCGRS485",   0x542e},
79 -       {"asm-generic/ioctls.h",        "TIOCSRS485",   0x542f},
80 -       {"asm-generic/ioctls.h",        "TIOCGPTN",     0x5430},
81 -       {"asm-generic/ioctls.h",        "TIOCSPTLCK",   0x5431},
82 -       {"asm-generic/ioctls.h",        "TCGETX",       0x5432},
83 -       {"asm-generic/ioctls.h",        "TCSETX",       0x5433},
84 -       {"asm-generic/ioctls.h",        "TCSETXF",      0x5434},
85 -       {"asm-generic/ioctls.h",        "TCSETXW",      0x5435},
86 -       {"asm-generic/ioctls.h",        "TIOCSIG",      0x5436},
87 -       {"asm-generic/ioctls.h",        "FIONCLEX",     0x5450},
88 -       {"asm-generic/ioctls.h",        "FIOCLEX",      0x5451},
89 -       {"asm-generic/ioctls.h",        "FIOASYNC",     0x5452},
90 -       {"asm-generic/ioctls.h",        "TIOCSERCONFIG",        0x5453},
91 -       {"asm-generic/ioctls.h",        "TIOCSERGWILD", 0x5454},
92 -       {"asm-generic/ioctls.h",        "TIOCSERSWILD", 0x5455},
93 -       {"asm-generic/ioctls.h",        "TIOCGLCKTRMIOS",       0x5456},
94 -       {"asm-generic/ioctls.h",        "TIOCSLCKTRMIOS",       0x5457},
95 -       {"asm-generic/ioctls.h",        "TIOCSERGSTRUCT",       0x5458},
96 -       {"asm-generic/ioctls.h",        "TIOCSERGETLSR",        0x5459},
97 -       {"asm-generic/ioctls.h",        "TIOCSERGETMULTI",      0x545a},
98 -       {"asm-generic/ioctls.h",        "TIOCSERSETMULTI",      0x545b},
99 -       {"asm-generic/ioctls.h",        "TIOCMIWAIT",   0x545c},
100 -       {"asm-generic/ioctls.h",        "TIOCGICOUNT",  0x545d},
101         {"asm/ioctls.h",        "FIOQSIZE",     0x545e},
102 -       {"asm-generic/ioctls.h",        "TIOCGHAYESESP",        0x545e},
103 -       {"asm-generic/ioctls.h",        "TIOCSHAYESESP",        0x545f},
104 -       {"asm-generic/ioctls.h",        "FIOQSIZE",     0x5460},
105         {"asm/bfin_simple_timer.h",     "BFIN_SIMPLE_TIMER_SET_PERIOD", 0x7402},
106         {"asm/bfin_simple_timer.h",     "BFIN_SIMPLE_TIMER_START",      0x7406},
107         {"asm/bfin_simple_timer.h",     "BFIN_SIMPLE_TIMER_STOP",       0x7408},
108         {"asm/bfin_simple_timer.h",     "BFIN_SIMPLE_TIMER_READ",       0x740a},
109 -       {"asm-generic/sockios.h",       "FIOSETOWN",    0x8901},
110 -       {"asm-generic/sockios.h",       "SIOCSPGRP",    0x8902},
111 -       {"asm-generic/sockios.h",       "FIOGETOWN",    0x8903},
112 -       {"asm-generic/sockios.h",       "SIOCGPGRP",    0x8904},
113 -       {"asm-generic/sockios.h",       "SIOCATMARK",   0x8905},
114 -       {"asm-generic/sockios.h",       "SIOCGSTAMP",   0x8906},
115 -       {"asm-generic/sockios.h",       "SIOCGSTAMPNS", 0x8907},
116 diff --git a/linux/i386/ioctlent.h.in b/linux/i386/ioctlent.h.in
117 index 9a90ec8..449ad40 100644
118 --- a/linux/i386/ioctlent.h.in
119 +++ b/linux/i386/ioctlent.h.in
120 @@ -11,82 +11,5 @@
121         {"asm/mtrr.h",  "MTRRIOC_DEL_PAGE_ENTRY",       0x4d07},
122         {"asm/mtrr.h",  "MTRRIOC_GET_PAGE_ENTRY",       0x4d08},
123         {"asm/mtrr.h",  "MTRRIOC_KILL_PAGE_ENTRY",      0x4d09},
124 -       {"asm-generic/ioctls.h",        "TCGETS",       0x5401},
125 -       {"asm-generic/ioctls.h",        "TCSETS",       0x5402},
126 -       {"asm-generic/ioctls.h",        "TCSETSW",      0x5403},
127 -       {"asm-generic/ioctls.h",        "TCSETSF",      0x5404},
128 -       {"asm-generic/ioctls.h",        "TCGETA",       0x5405},
129 -       {"asm-generic/ioctls.h",        "TCSETA",       0x5406},
130 -       {"asm-generic/ioctls.h",        "TCSETAW",      0x5407},
131 -       {"asm-generic/ioctls.h",        "TCSETAF",      0x5408},
132 -       {"asm-generic/ioctls.h",        "TCSBRK",       0x5409},
133 -       {"asm-generic/ioctls.h",        "TCXONC",       0x540a},
134 -       {"asm-generic/ioctls.h",        "TCFLSH",       0x540b},
135 -       {"asm-generic/ioctls.h",        "TIOCEXCL",     0x540c},
136 -       {"asm-generic/ioctls.h",        "TIOCNXCL",     0x540d},
137 -       {"asm-generic/ioctls.h",        "TIOCSCTTY",    0x540e},
138 -       {"asm-generic/ioctls.h",        "TIOCGPGRP",    0x540f},
139 -       {"asm-generic/ioctls.h",        "TIOCSPGRP",    0x5410},
140 -       {"asm-generic/ioctls.h",        "TIOCOUTQ",     0x5411},
141 -       {"asm-generic/ioctls.h",        "TIOCSTI",      0x5412},
142 -       {"asm-generic/ioctls.h",        "TIOCGWINSZ",   0x5413},
143 -       {"asm-generic/ioctls.h",        "TIOCSWINSZ",   0x5414},
144 -       {"asm-generic/ioctls.h",        "TIOCMGET",     0x5415},
145 -       {"asm-generic/ioctls.h",        "TIOCMBIS",     0x5416},
146 -       {"asm-generic/ioctls.h",        "TIOCMBIC",     0x5417},
147 -       {"asm-generic/ioctls.h",        "TIOCMSET",     0x5418},
148 -       {"asm-generic/ioctls.h",        "TIOCGSOFTCAR", 0x5419},
149 -       {"asm-generic/ioctls.h",        "TIOCSSOFTCAR", 0x541a},
150 -       {"asm-generic/ioctls.h",        "FIONREAD",     0x541b},
151 -       {"asm-generic/ioctls.h",        "TIOCLINUX",    0x541c},
152 -       {"asm-generic/ioctls.h",        "TIOCCONS",     0x541d},
153 -       {"asm-generic/ioctls.h",        "TIOCGSERIAL",  0x541e},
154 -       {"asm-generic/ioctls.h",        "TIOCSSERIAL",  0x541f},
155 -       {"asm-generic/ioctls.h",        "TIOCPKT",      0x5420},
156 -       {"asm-generic/ioctls.h",        "FIONBIO",      0x5421},
157 -       {"asm-generic/ioctls.h",        "TIOCNOTTY",    0x5422},
158 -       {"asm-generic/ioctls.h",        "TIOCSETD",     0x5423},
159 -       {"asm-generic/ioctls.h",        "TIOCGETD",     0x5424},
160 -       {"asm-generic/ioctls.h",        "TCSBRKP",      0x5425},
161 -       {"asm-generic/ioctls.h",        "TIOCSBRK",     0x5427},
162 -       {"asm-generic/ioctls.h",        "TIOCCBRK",     0x5428},
163 -       {"asm-generic/ioctls.h",        "TIOCGSID",     0x5429},
164 -       {"asm-generic/ioctls.h",        "TCGETS2",      0x542a},
165 -       {"asm-generic/ioctls.h",        "TCSETS2",      0x542b},
166 -       {"asm-generic/ioctls.h",        "TCSETSW2",     0x542c},
167 -       {"asm-generic/ioctls.h",        "TCSETSF2",     0x542d},
168 -       {"asm-generic/ioctls.h",        "TIOCGRS485",   0x542e},
169 -       {"asm-generic/ioctls.h",        "TIOCSRS485",   0x542f},
170 -       {"asm-generic/ioctls.h",        "TIOCGPTN",     0x5430},
171 -       {"asm-generic/ioctls.h",        "TIOCSPTLCK",   0x5431},
172 -       {"asm-generic/ioctls.h",        "TCGETX",       0x5432},
173 -       {"asm-generic/ioctls.h",        "TIOCGDEV",     0x5432},
174 -       {"asm-generic/ioctls.h",        "TCSETX",       0x5433},
175 -       {"asm-generic/ioctls.h",        "TCSETXF",      0x5434},
176 -       {"asm-generic/ioctls.h",        "TCSETXW",      0x5435},
177 -       {"asm-generic/ioctls.h",        "TIOCSIG",      0x5436},
178 -       {"asm-generic/ioctls.h",        "TIOCVHANGUP",  0x5437},
179 -       {"asm-generic/ioctls.h",        "FIONCLEX",     0x5450},
180 -       {"asm-generic/ioctls.h",        "FIOCLEX",      0x5451},
181 -       {"asm-generic/ioctls.h",        "FIOASYNC",     0x5452},
182 -       {"asm-generic/ioctls.h",        "TIOCSERCONFIG",        0x5453},
183 -       {"asm-generic/ioctls.h",        "TIOCSERGWILD", 0x5454},
184 -       {"asm-generic/ioctls.h",        "TIOCSERSWILD", 0x5455},
185 -       {"asm-generic/ioctls.h",        "TIOCGLCKTRMIOS",       0x5456},
186 -       {"asm-generic/ioctls.h",        "TIOCSLCKTRMIOS",       0x5457},
187 -       {"asm-generic/ioctls.h",        "TIOCSERGSTRUCT",       0x5458},
188 -       {"asm-generic/ioctls.h",        "TIOCSERGETLSR",        0x5459},
189 -       {"asm-generic/ioctls.h",        "TIOCSERGETMULTI",      0x545a},
190 -       {"asm-generic/ioctls.h",        "TIOCSERSETMULTI",      0x545b},
191 -       {"asm-generic/ioctls.h",        "TIOCMIWAIT",   0x545c},
192 -       {"asm-generic/ioctls.h",        "TIOCGICOUNT",  0x545d},
193 -       {"asm-generic/ioctls.h",        "FIOQSIZE",     0x5460},
194         {"asm/msr.h",   "X86_IOC_RDMSR_REGS",   0x63a0},
195         {"asm/msr.h",   "X86_IOC_WRMSR_REGS",   0x63a1},
196 -       {"asm-generic/sockios.h",       "FIOSETOWN",    0x8901},
197 -       {"asm-generic/sockios.h",       "SIOCSPGRP",    0x8902},
198 -       {"asm-generic/sockios.h",       "FIOGETOWN",    0x8903},
199 -       {"asm-generic/sockios.h",       "SIOCGPGRP",    0x8904},
200 -       {"asm-generic/sockios.h",       "SIOCATMARK",   0x8905},
201 -       {"asm-generic/sockios.h",       "SIOCGSTAMP",   0x8906},
202 -       {"asm-generic/sockios.h",       "SIOCGSTAMPNS", 0x8907},
203 diff --git a/linux/ioctlent.h.in b/linux/ioctlent.h.in
204 index 895070c..8843b47 100644
205 --- a/linux/ioctlent.h.in
206 +++ b/linux/ioctlent.h.in
207 @@ -734,21 +734,94 @@
208         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_PVERSION",   0x5400},
209         {"linux/soundcard.h",   "SNDCTL_TMR_TIMEBASE",  0x5401},
210         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_NEXT_DEVICE",        0x5401},
211 +       {"asm-generic/ioctls.h",        "TCGETS",       0x5401},
212         {"linux/soundcard.h",   "SNDCTL_TMR_START",     0x5402},
213         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_TREAD",      0x5402},
214 +       {"asm-generic/ioctls.h",        "TCSETS",       0x5402},
215         {"linux/soundcard.h",   "SNDCTL_TMR_STOP",      0x5403},
216         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_GINFO",      0x5403},
217 +       {"asm-generic/ioctls.h",        "TCSETSW",      0x5403},
218         {"linux/soundcard.h",   "SNDCTL_TMR_CONTINUE",  0x5404},
219         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_GPARAMS",    0x5404},
220 +       {"asm-generic/ioctls.h",        "TCSETSF",      0x5404},
221         {"linux/soundcard.h",   "SNDCTL_TMR_TEMPO",     0x5405},
222         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_GSTATUS",    0x5405},
223 +       {"asm-generic/ioctls.h",        "TCGETA",       0x5405},
224         {"linux/soundcard.h",   "SNDCTL_TMR_SOURCE",    0x5406},
225 +       {"asm-generic/ioctls.h",        "TCSETA",       0x5406},
226         {"linux/soundcard.h",   "SNDCTL_TMR_METRONOME", 0x5407},
227 +       {"asm-generic/ioctls.h",        "TCSETAW",      0x5407},
228         {"linux/soundcard.h",   "SNDCTL_TMR_SELECT",    0x5408},
229 +       {"asm-generic/ioctls.h",        "TCSETAF",      0x5408},
230 +       {"asm-generic/ioctls.h",        "TCSBRK",       0x5409},
231 +       {"asm-generic/ioctls.h",        "TCXONC",       0x540a},
232 +       {"asm-generic/ioctls.h",        "TCFLSH",       0x540b},
233 +       {"asm-generic/ioctls.h",        "TIOCEXCL",     0x540c},
234 +       {"asm-generic/ioctls.h",        "TIOCNXCL",     0x540d},
235 +       {"asm-generic/ioctls.h",        "TIOCSCTTY",    0x540e},
236 +       {"asm-generic/ioctls.h",        "TIOCGPGRP",    0x540f},
237         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_SELECT",     0x5410},
238 +       {"asm-generic/ioctls.h",        "TIOCSPGRP",    0x5410},
239         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_INFO",       0x5411},
240 +       {"asm-generic/ioctls.h",        "TIOCOUTQ",     0x5411},
241         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_PARAMS",     0x5412},
242 +       {"asm-generic/ioctls.h",        "TIOCSTI",      0x5412},
243 +       {"asm-generic/ioctls.h",        "TIOCGWINSZ",   0x5413},
244         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_STATUS",     0x5414},
245 +       {"asm-generic/ioctls.h",        "TIOCSWINSZ",   0x5414},
246 +       {"asm-generic/ioctls.h",        "TIOCMGET",     0x5415},
247 +       {"asm-generic/ioctls.h",        "TIOCMBIS",     0x5416},
248 +       {"asm-generic/ioctls.h",        "TIOCMBIC",     0x5417},
249 +       {"asm-generic/ioctls.h",        "TIOCMSET",     0x5418},
250 +       {"asm-generic/ioctls.h",        "TIOCGSOFTCAR", 0x5419},
251 +       {"asm-generic/ioctls.h",        "TIOCSSOFTCAR", 0x541a},
252 +       {"asm-generic/ioctls.h",        "FIONREAD",     0x541b},
253 +       {"asm-generic/ioctls.h",        "TIOCLINUX",    0x541c},
254 +       {"asm-generic/ioctls.h",        "TIOCCONS",     0x541d},
255 +       {"asm-generic/ioctls.h",        "TIOCGSERIAL",  0x541e},
256 +       {"asm-generic/ioctls.h",        "TIOCSSERIAL",  0x541f},
257 +       {"asm-generic/ioctls.h",        "TIOCPKT",      0x5420},
258 +       {"asm-generic/ioctls.h",        "FIONBIO",      0x5421},
259 +       {"asm-generic/ioctls.h",        "TIOCNOTTY",    0x5422},
260 +       {"asm-generic/ioctls.h",        "TIOCSETD",     0x5423},
261 +       {"asm-generic/ioctls.h",        "TIOCGETD",     0x5424},
262 +       {"asm-generic/ioctls.h",        "TCSBRKP",      0x5425},
263 +       {"asm-generic/ioctls.h",        "TIOCTTYGSTRUCT",       0x5426},
264 +       {"asm-generic/ioctls.h",        "TIOCSBRK",     0x5427},
265 +       {"asm-generic/ioctls.h",        "TIOCCBRK",     0x5428},
266 +       {"asm-generic/ioctls.h",        "TIOCGSID",     0x5429},
267 +       {"asm-generic/ioctls.h",        "TCGETS2",      0x542a},
268 +       {"asm-generic/ioctls.h",        "TCSETS2",      0x542b},
269 +       {"asm-generic/ioctls.h",        "TCSETSW2",     0x542c},
270 +       {"asm-generic/ioctls.h",        "TCSETSF2",     0x542d},
271 +       {"asm-generic/ioctls.h",        "TIOCGRS485",   0x542e},
272 +       {"asm-generic/ioctls.h",        "TIOCSRS485",   0x542f},
273 +       {"asm-generic/ioctls.h",        "TIOCGPTN",     0x5430},
274 +       {"asm-generic/ioctls.h",        "TIOCSPTLCK",   0x5431},
275 +       {"asm-generic/ioctls.h",        "TCGETX",       0x5432},
276 +       {"asm-generic/ioctls.h",        "TIOCGDEV",     0x5432},
277 +       {"asm-generic/ioctls.h",        "TCSETX",       0x5433},
278 +       {"asm-generic/ioctls.h",        "TCSETXF",      0x5434},
279 +       {"asm-generic/ioctls.h",        "TCSETXW",      0x5435},
280 +       {"asm-generic/ioctls.h",        "TIOCSIG",      0x5436},
281 +       {"asm-generic/ioctls.h",        "TIOCVHANGUP",  0x5437},
282 +       {"asm-generic/ioctls.h",        "FIONCLEX",     0x5450},
283 +       {"asm-generic/ioctls.h",        "FIOCLEX",      0x5451},
284 +       {"asm-generic/ioctls.h",        "FIOASYNC",     0x5452},
285 +       {"asm-generic/ioctls.h",        "TIOCSERCONFIG",        0x5453},
286 +       {"asm-generic/ioctls.h",        "TIOCSERGWILD", 0x5454},
287 +       {"asm-generic/ioctls.h",        "TIOCSERSWILD", 0x5455},
288 +       {"asm-generic/ioctls.h",        "TIOCGLCKTRMIOS",       0x5456},
289 +       {"asm-generic/ioctls.h",        "TIOCSLCKTRMIOS",       0x5457},
290 +       {"asm-generic/ioctls.h",        "TIOCSERGSTRUCT",       0x5458},
291 +       {"asm-generic/ioctls.h",        "TIOCSERGETLSR",        0x5459},
292 +       {"asm-generic/ioctls.h",        "TIOCSERGETMULTI",      0x545a},
293 +       {"asm-generic/ioctls.h",        "TIOCSERSETMULTI",      0x545b},
294 +       {"asm-generic/ioctls.h",        "TIOCMIWAIT",   0x545c},
295 +       {"asm-generic/ioctls.h",        "TIOCGICOUNT",  0x545d},
296 +       {"asm-generic/ioctls.h",        "TIOCGHAYESESP",        0x545e},
297 +       {"asm-generic/ioctls.h",        "TIOCSHAYESESP",        0x545f},
298 +       {"asm-generic/ioctls.h",        "FIOQSIZE",     0x5460},
299         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_START",      0x54a0},
300         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_STOP",       0x54a1},
301         {"sound/asound.h",      "SNDRV_TIMER_IOCTL_CONTINUE",   0x54a2},
302 @@ -1606,6 +1679,13 @@
303         {"linux/media.h",       "MEDIA_IOC_ENUM_ENTITIES",      0x7c01},
304         {"linux/media.h",       "MEDIA_IOC_ENUM_LINKS", 0x7c02},
305         {"linux/media.h",       "MEDIA_IOC_SETUP_LINK", 0x7c03},
306 +       {"asm-generic/sockios.h",       "FIOSETOWN",    0x8901},
307 +       {"asm-generic/sockios.h",       "SIOCSPGRP",    0x8902},
308 +       {"asm-generic/sockios.h",       "FIOGETOWN",    0x8903},
309 +       {"asm-generic/sockios.h",       "SIOCGPGRP",    0x8904},
310 +       {"asm-generic/sockios.h",       "SIOCATMARK",   0x8905},
311 +       {"asm-generic/sockios.h",       "SIOCGSTAMP",   0x8906},
312 +       {"asm-generic/sockios.h",       "SIOCGSTAMPNS", 0x8907},
313         {"linux/sockios.h",     "SIOCADDRT",    0x890b},
314         {"linux/sockios.h",     "SIOCDELRT",    0x890c},
315         {"linux/sockios.h",     "SIOCRTMSG",    0x890d},
316 diff --git a/linux/powerpc/ioctlent.h.in b/linux/powerpc/ioctlent.h.in
317 index 0870704..510f5aa 100644
318 --- a/linux/powerpc/ioctlent.h.in
319 +++ b/linux/powerpc/ioctlent.h.in
320 @@ -1,36 +1,18 @@
321 -       {"asm-generic/ioctls.h",        "TCGETS",       0x5401},
322 -       {"asm-generic/ioctls.h",        "TCSETS",       0x5402},
323 -       {"asm-generic/ioctls.h",        "TCSETSW",      0x5403},
324 -       {"asm-generic/ioctls.h",        "TCSETSF",      0x5404},
325 -       {"asm-generic/ioctls.h",        "TCGETA",       0x5405},
326 -       {"asm-generic/ioctls.h",        "TCSETA",       0x5406},
327 -       {"asm-generic/ioctls.h",        "TCSETAW",      0x5407},
328 -       {"asm-generic/ioctls.h",        "TCSETAF",      0x5408},
329 -       {"asm-generic/ioctls.h",        "TCSBRK",       0x5409},
330 -       {"asm-generic/ioctls.h",        "TCXONC",       0x540a},
331 -       {"asm-generic/ioctls.h",        "TCFLSH",       0x540b},
332         {"asm/ioctls.h",        "TIOCEXCL",     0x540c},
333         {"asm/ioctls.h",        "TIOCNXCL",     0x540d},
334         {"asm/ioctls.h",        "TIOCSCTTY",    0x540e},
335 -       {"asm-generic/ioctls.h",        "TIOCGPGRP",    0x540f},
336 -       {"asm-generic/ioctls.h",        "TIOCSPGRP",    0x5410},
337 -       {"asm-generic/ioctls.h",        "TIOCOUTQ",     0x5411},
338         {"asm/ioctls.h",        "TIOCSTI",      0x5412},
339 -       {"asm-generic/ioctls.h",        "TIOCGWINSZ",   0x5413},
340 -       {"asm-generic/ioctls.h",        "TIOCSWINSZ",   0x5414},
341         {"asm/ioctls.h",        "TIOCMGET",     0x5415},
342         {"asm/ioctls.h",        "TIOCMBIS",     0x5416},
343         {"asm/ioctls.h",        "TIOCMBIC",     0x5417},
344         {"asm/ioctls.h",        "TIOCMSET",     0x5418},
345         {"asm/ioctls.h",        "TIOCGSOFTCAR", 0x5419},
346         {"asm/ioctls.h",        "TIOCSSOFTCAR", 0x541a},
347 -       {"asm-generic/ioctls.h",        "FIONREAD",     0x541b},
348         {"asm/ioctls.h",        "TIOCLINUX",    0x541c},
349         {"asm/ioctls.h",        "TIOCCONS",     0x541d},
350         {"asm/ioctls.h",        "TIOCGSERIAL",  0x541e},
351         {"asm/ioctls.h",        "TIOCSSERIAL",  0x541f},
352         {"asm/ioctls.h",        "TIOCPKT",      0x5420},
353 -       {"asm-generic/ioctls.h",        "FIONBIO",      0x5421},
354         {"asm/ioctls.h",        "TIOCNOTTY",    0x5422},
355         {"asm/ioctls.h",        "TIOCSETD",     0x5423},
356         {"asm/ioctls.h",        "TIOCGETD",     0x5424},
357 @@ -38,22 +20,11 @@
358         {"asm/ioctls.h",        "TIOCSBRK",     0x5427},
359         {"asm/ioctls.h",        "TIOCCBRK",     0x5428},
360         {"asm/ioctls.h",        "TIOCGSID",     0x5429},
361 -       {"asm-generic/ioctls.h",        "TCGETS2",      0x542a},
362 -       {"asm-generic/ioctls.h",        "TCSETS2",      0x542b},
363 -       {"asm-generic/ioctls.h",        "TCSETSW2",     0x542c},
364 -       {"asm-generic/ioctls.h",        "TCSETSF2",     0x542d},
365         {"asm/ioctls.h",        "TIOCGRS485",   0x542e},
366         {"asm/ioctls.h",        "TIOCSRS485",   0x542f},
367         {"asm/ioctls.h",        "TIOCGPTN",     0x5430},
368         {"asm/ioctls.h",        "TIOCSPTLCK",   0x5431},
369 -       {"asm-generic/ioctls.h",        "TCGETX",       0x5432},
370 -       {"asm-generic/ioctls.h",        "TCSETX",       0x5433},
371 -       {"asm-generic/ioctls.h",        "TCSETXF",      0x5434},
372 -       {"asm-generic/ioctls.h",        "TCSETXW",      0x5435},
373         {"asm/ioctls.h",        "TIOCSIG",      0x5436},
374 -       {"asm-generic/ioctls.h",        "FIONCLEX",     0x5450},
375 -       {"asm-generic/ioctls.h",        "FIOCLEX",      0x5451},
376 -       {"asm-generic/ioctls.h",        "FIOASYNC",     0x5452},
377         {"asm/ioctls.h",        "TIOCSERCONFIG",        0x5453},
378         {"asm/ioctls.h",        "TIOCSERGWILD", 0x5454},
379         {"asm/ioctls.h",        "TIOCSERSWILD", 0x5455},
380 @@ -65,7 +36,6 @@
381         {"asm/ioctls.h",        "TIOCSERSETMULTI",      0x545b},
382         {"asm/ioctls.h",        "TIOCMIWAIT",   0x545c},
383         {"asm/ioctls.h",        "TIOCGICOUNT",  0x545d},
384 -       {"asm-generic/ioctls.h",        "FIOQSIZE",     0x5460},
385         {"asm/ioctls.h",        "FIOCLEX",      0x6601},
386         {"asm/ioctls.h",        "FIONCLEX",     0x6602},
387         {"asm/ioctls.h",        "FIOASYNC",     0x667d},
388 diff --git a/linux/s390/ioctlent.h.in b/linux/s390/ioctlent.h.in
389 index 35cdd81..1e93a0b 100644
390 --- a/linux/s390/ioctlent.h.in
391 +++ b/linux/s390/ioctlent.h.in
392 @@ -19,76 +19,7 @@
393         {"asm/cmb.h",   "BIODASDCMFDISABLE",    0x4421},
394         {"asm/cmb.h",   "BIODASDREADALLCMB",    0x4421},
395         {"asm/dasd.h",  "BIODASDSYMMIO",        0x44f0},
396 -       {"asm-generic/ioctls.h",        "TCGETS",       0x5401},
397 -       {"asm-generic/ioctls.h",        "TCSETS",       0x5402},
398 -       {"asm-generic/ioctls.h",        "TCSETSW",      0x5403},
399 -       {"asm-generic/ioctls.h",        "TCSETSF",      0x5404},
400 -       {"asm-generic/ioctls.h",        "TCGETA",       0x5405},
401 -       {"asm-generic/ioctls.h",        "TCSETA",       0x5406},
402 -       {"asm-generic/ioctls.h",        "TCSETAW",      0x5407},
403 -       {"asm-generic/ioctls.h",        "TCSETAF",      0x5408},
404 -       {"asm-generic/ioctls.h",        "TCSBRK",       0x5409},
405 -       {"asm-generic/ioctls.h",        "TCXONC",       0x540a},
406 -       {"asm-generic/ioctls.h",        "TCFLSH",       0x540b},
407 -       {"asm-generic/ioctls.h",        "TIOCEXCL",     0x540c},
408 -       {"asm-generic/ioctls.h",        "TIOCNXCL",     0x540d},
409 -       {"asm-generic/ioctls.h",        "TIOCSCTTY",    0x540e},
410 -       {"asm-generic/ioctls.h",        "TIOCGPGRP",    0x540f},
411 -       {"asm-generic/ioctls.h",        "TIOCSPGRP",    0x5410},
412 -       {"asm-generic/ioctls.h",        "TIOCOUTQ",     0x5411},
413 -       {"asm-generic/ioctls.h",        "TIOCSTI",      0x5412},
414 -       {"asm-generic/ioctls.h",        "TIOCGWINSZ",   0x5413},
415 -       {"asm-generic/ioctls.h",        "TIOCSWINSZ",   0x5414},
416 -       {"asm-generic/ioctls.h",        "TIOCMGET",     0x5415},
417 -       {"asm-generic/ioctls.h",        "TIOCMBIS",     0x5416},
418 -       {"asm-generic/ioctls.h",        "TIOCMBIC",     0x5417},
419 -       {"asm-generic/ioctls.h",        "TIOCMSET",     0x5418},
420 -       {"asm-generic/ioctls.h",        "TIOCGSOFTCAR", 0x5419},
421 -       {"asm-generic/ioctls.h",        "TIOCSSOFTCAR", 0x541a},
422 -       {"asm-generic/ioctls.h",        "FIONREAD",     0x541b},
423 -       {"asm-generic/ioctls.h",        "TIOCLINUX",    0x541c},
424 -       {"asm-generic/ioctls.h",        "TIOCCONS",     0x541d},
425 -       {"asm-generic/ioctls.h",        "TIOCGSERIAL",  0x541e},
426 -       {"asm-generic/ioctls.h",        "TIOCSSERIAL",  0x541f},
427 -       {"asm-generic/ioctls.h",        "TIOCPKT",      0x5420},
428 -       {"asm-generic/ioctls.h",        "FIONBIO",      0x5421},
429 -       {"asm-generic/ioctls.h",        "TIOCNOTTY",    0x5422},
430 -       {"asm-generic/ioctls.h",        "TIOCSETD",     0x5423},
431 -       {"asm-generic/ioctls.h",        "TIOCGETD",     0x5424},
432 -       {"asm-generic/ioctls.h",        "TCSBRKP",      0x5425},
433 -       {"asm-generic/ioctls.h",        "TIOCSBRK",     0x5427},
434 -       {"asm-generic/ioctls.h",        "TIOCCBRK",     0x5428},
435 -       {"asm-generic/ioctls.h",        "TIOCGSID",     0x5429},
436 -       {"asm-generic/ioctls.h",        "TCGETS2",      0x542a},
437 -       {"asm-generic/ioctls.h",        "TCSETS2",      0x542b},
438 -       {"asm-generic/ioctls.h",        "TCSETSW2",     0x542c},
439 -       {"asm-generic/ioctls.h",        "TCSETSF2",     0x542d},
440 -       {"asm-generic/ioctls.h",        "TIOCGRS485",   0x542e},
441 -       {"asm-generic/ioctls.h",        "TIOCSRS485",   0x542f},
442 -       {"asm-generic/ioctls.h",        "TIOCGPTN",     0x5430},
443 -       {"asm-generic/ioctls.h",        "TIOCSPTLCK",   0x5431},
444 -       {"asm-generic/ioctls.h",        "TCGETX",       0x5432},
445 -       {"asm-generic/ioctls.h",        "TIOCGDEV",     0x5432},
446 -       {"asm-generic/ioctls.h",        "TCSETX",       0x5433},
447 -       {"asm-generic/ioctls.h",        "TCSETXF",      0x5434},
448 -       {"asm-generic/ioctls.h",        "TCSETXW",      0x5435},
449 -       {"asm-generic/ioctls.h",        "TIOCSIG",      0x5436},
450 -       {"asm-generic/ioctls.h",        "FIONCLEX",     0x5450},
451 -       {"asm-generic/ioctls.h",        "FIOCLEX",      0x5451},
452 -       {"asm-generic/ioctls.h",        "FIOASYNC",     0x5452},
453 -       {"asm-generic/ioctls.h",        "TIOCSERCONFIG",        0x5453},
454 -       {"asm-generic/ioctls.h",        "TIOCSERGWILD", 0x5454},
455 -       {"asm-generic/ioctls.h",        "TIOCSERSWILD", 0x5455},
456 -       {"asm-generic/ioctls.h",        "TIOCGLCKTRMIOS",       0x5456},
457 -       {"asm-generic/ioctls.h",        "TIOCSLCKTRMIOS",       0x5457},
458 -       {"asm-generic/ioctls.h",        "TIOCSERGSTRUCT",       0x5458},
459 -       {"asm-generic/ioctls.h",        "TIOCSERGETLSR",        0x5459},
460 -       {"asm-generic/ioctls.h",        "TIOCSERGETMULTI",      0x545a},
461 -       {"asm-generic/ioctls.h",        "TIOCSERSETMULTI",      0x545b},
462 -       {"asm-generic/ioctls.h",        "TIOCMIWAIT",   0x545c},
463 -       {"asm-generic/ioctls.h",        "TIOCGICOUNT",  0x545d},
464         {"asm/ioctls.h",        "FIOQSIZE",     0x545e},
465 -       {"asm-generic/ioctls.h",        "FIOQSIZE",     0x5460},
466         {"asm/chsc.h",  "CHSC_START",   0x6381},
467         {"asm/chsc.h",  "CHSC_INFO_CHANNEL_PATH",       0x6382},
468         {"asm/chsc.h",  "CHSC_INFO_CU", 0x6383},
469 @@ -116,10 +47,3 @@
470         {"asm/zcrypt.h",        "Z90STAT_PCIXCCMCL3COUNT",      0x7a4c},
471         {"asm/zcrypt.h",        "Z90STAT_CEX2CCOUNT",   0x7a4d},
472         {"asm/zcrypt.h",        "Z90STAT_CEX2ACOUNT",   0x7a4e},
473 -       {"asm-generic/sockios.h",       "FIOSETOWN",    0x8901},
474 -       {"asm-generic/sockios.h",       "SIOCSPGRP",    0x8902},
475 -       {"asm-generic/sockios.h",       "FIOGETOWN",    0x8903},
476 -       {"asm-generic/sockios.h",       "SIOCGPGRP",    0x8904},
477 -       {"asm-generic/sockios.h",       "SIOCATMARK",   0x8905},
478 -       {"asm-generic/sockios.h",       "SIOCGSTAMP",   0x8906},
479 -       {"asm-generic/sockios.h",       "SIOCGSTAMPNS", 0x8907},
480 diff --git a/linux/sparc/ioctlent.h.in b/linux/sparc/ioctlent.h.in
481 index 25b7b4d..008aae0 100644
482 --- a/linux/sparc/ioctlent.h.in
483 +++ b/linux/sparc/ioctlent.h.in
484 @@ -32,76 +32,24 @@
485         {"asm/openpromio.h",    "OPIOCGETNEXT", 0x4f05},
486         {"asm/openpromio.h",    "OPIOCGETCHILD",        0x4f06},
487         {"asm/ioctls.h",        "TCGETA",       0x5401},
488 -       {"asm-generic/ioctls.h",        "TCGETS",       0x5401},
489         {"asm/ioctls.h",        "TCSETA",       0x5402},
490 -       {"asm-generic/ioctls.h",        "TCSETS",       0x5402},
491         {"asm/ioctls.h",        "TCSETAW",      0x5403},
492 -       {"asm-generic/ioctls.h",        "TCSETSW",      0x5403},
493         {"asm/ioctls.h",        "TCSETAF",      0x5404},
494 -       {"asm-generic/ioctls.h",        "TCSETSF",      0x5404},
495 -       {"asm-generic/ioctls.h",        "TCGETA",       0x5405},
496         {"asm/ioctls.h",        "TCSBRK",       0x5405},
497 -       {"asm-generic/ioctls.h",        "TCSETA",       0x5406},
498         {"asm/ioctls.h",        "TCXONC",       0x5406},
499         {"asm/ioctls.h",        "TCFLSH",       0x5407},
500 -       {"asm-generic/ioctls.h",        "TCSETAW",      0x5407},
501         {"asm/ioctls.h",        "TCGETS",       0x5408},
502 -       {"asm-generic/ioctls.h",        "TCSETAF",      0x5408},
503 -       {"asm-generic/ioctls.h",        "TCSBRK",       0x5409},
504         {"asm/ioctls.h",        "TCSETS",       0x5409},
505         {"asm/ioctls.h",        "TCSETSW",      0x540a},
506 -       {"asm-generic/ioctls.h",        "TCXONC",       0x540a},
507 -       {"asm-generic/ioctls.h",        "TCFLSH",       0x540b},
508         {"asm/ioctls.h",        "TCSETSF",      0x540b},
509         {"asm/ioctls.h",        "TCGETS2",      0x540c},
510 -       {"asm-generic/ioctls.h",        "TIOCEXCL",     0x540c},
511         {"asm/ioctls.h",        "TCSETS2",      0x540d},
512 -       {"asm-generic/ioctls.h",        "TIOCNXCL",     0x540d},
513         {"asm/ioctls.h",        "TCSETSW2",     0x540e},
514 -       {"asm-generic/ioctls.h",        "TIOCSCTTY",    0x540e},
515         {"asm/ioctls.h",        "TCSETSF2",     0x540f},
516 -       {"asm-generic/ioctls.h",        "TIOCGPGRP",    0x540f},
517 -       {"asm-generic/ioctls.h",        "TIOCSPGRP",    0x5410},
518 -       {"asm-generic/ioctls.h",        "TIOCOUTQ",     0x5411},
519 -       {"asm-generic/ioctls.h",        "TIOCSTI",      0x5412},
520 -       {"asm-generic/ioctls.h",        "TIOCGWINSZ",   0x5413},
521 -       {"asm-generic/ioctls.h",        "TIOCSWINSZ",   0x5414},
522 -       {"asm-generic/ioctls.h",        "TIOCMGET",     0x5415},
523 -       {"asm-generic/ioctls.h",        "TIOCMBIS",     0x5416},
524 -       {"asm-generic/ioctls.h",        "TIOCMBIC",     0x5417},
525 -       {"asm-generic/ioctls.h",        "TIOCMSET",     0x5418},
526 -       {"asm-generic/ioctls.h",        "TIOCGSOFTCAR", 0x5419},
527 -       {"asm-generic/ioctls.h",        "TIOCSSOFTCAR", 0x541a},
528 -       {"asm-generic/ioctls.h",        "FIONREAD",     0x541b},
529         {"asm/ioctls.h",        "TIOCLINUX",    0x541c},
530 -       {"asm-generic/ioctls.h",        "TIOCCONS",     0x541d},
531         {"asm/ioctls.h",        "TIOCGSERIAL",  0x541e},
532         {"asm/ioctls.h",        "TIOCSSERIAL",  0x541f},
533 -       {"asm-generic/ioctls.h",        "TIOCPKT",      0x5420},
534 -       {"asm-generic/ioctls.h",        "FIONBIO",      0x5421},
535 -       {"asm-generic/ioctls.h",        "TIOCNOTTY",    0x5422},
536 -       {"asm-generic/ioctls.h",        "TIOCSETD",     0x5423},
537 -       {"asm-generic/ioctls.h",        "TIOCGETD",     0x5424},
538         {"asm/ioctls.h",        "TCSBRKP",      0x5425},
539 -       {"asm-generic/ioctls.h",        "TIOCSBRK",     0x5427},
540 -       {"asm-generic/ioctls.h",        "TIOCCBRK",     0x5428},
541 -       {"asm-generic/ioctls.h",        "TIOCGSID",     0x5429},
542 -       {"asm-generic/ioctls.h",        "TCGETS2",      0x542a},
543 -       {"asm-generic/ioctls.h",        "TCSETS2",      0x542b},
544 -       {"asm-generic/ioctls.h",        "TCSETSW2",     0x542c},
545 -       {"asm-generic/ioctls.h",        "TCSETSF2",     0x542d},
546 -       {"asm-generic/ioctls.h",        "TIOCGRS485",   0x542e},
547 -       {"asm-generic/ioctls.h",        "TIOCSRS485",   0x542f},
548 -       {"asm-generic/ioctls.h",        "TIOCGPTN",     0x5430},
549 -       {"asm-generic/ioctls.h",        "TIOCSPTLCK",   0x5431},
550 -       {"asm-generic/ioctls.h",        "TCGETX",       0x5432},
551 -       {"asm-generic/ioctls.h",        "TCSETX",       0x5433},
552 -       {"asm-generic/ioctls.h",        "TCSETXF",      0x5434},
553 -       {"asm-generic/ioctls.h",        "TCSETXW",      0x5435},
554 -       {"asm-generic/ioctls.h",        "TIOCSIG",      0x5436},
555 -       {"asm-generic/ioctls.h",        "FIONCLEX",     0x5450},
556 -       {"asm-generic/ioctls.h",        "FIOCLEX",      0x5451},
557 -       {"asm-generic/ioctls.h",        "FIOASYNC",     0x5452},
558         {"asm/ioctls.h",        "TIOCSERCONFIG",        0x5453},
559         {"asm/ioctls.h",        "TIOCSERGWILD", 0x5454},
560         {"asm/ioctls.h",        "TIOCSERSWILD", 0x5455},
561 @@ -113,7 +61,6 @@
562         {"asm/ioctls.h",        "TIOCSERSETMULTI",      0x545b},
563         {"asm/ioctls.h",        "TIOCMIWAIT",   0x545c},
564         {"asm/ioctls.h",        "TIOCGICOUNT",  0x545d},
565 -       {"asm-generic/ioctls.h",        "FIOQSIZE",     0x5460},
566         {"asm/watchdog.h",      "WIOCSTART",    0x570a},
567         {"asm/watchdog.h",      "WIOCSTOP",     0x570b},
568         {"asm/watchdog.h",      "WIOCGSTAT",    0x570c},
569 -- 
570 1.8.0
571