Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gentoo-headers/3.2: 00_all_0001-kbuild-auto-convert-size-types-in-userspace-headers.patch 00_all_0002-linux-stat.h-remove-__GLIBC__-checks.patch 00_all_0003-linux-stddef.h-export-offsetof-to-userspace.patch 00_all_0004-linux-pull-in-other-needed-headers-for-userspace.patch 00_all_0005-netfilter-pull-in-limits.h.patch 00_all_0006-convert-PAGE_SIZE-usage.patch 00_all_0007-asm-generic-fcntl.h-namespace-kernel-file-structs.patch 00_all_0008-unifdef-drop-unused-errno.h-include.patch 90_all_x32-3.2.patch
Date: Sat, 07 Jan 2012 04:26:47
Message-Id: 20120107042636.2D60C2004B@flycatcher.gentoo.org
1 vapier 12/01/07 04:26:36
2
3 Added:
4 00_all_0001-kbuild-auto-convert-size-types-in-userspace-headers.patch
5 00_all_0002-linux-stat.h-remove-__GLIBC__-checks.patch
6 00_all_0003-linux-stddef.h-export-offsetof-to-userspace.patch
7 00_all_0004-linux-pull-in-other-needed-headers-for-userspace.patch
8 00_all_0005-netfilter-pull-in-limits.h.patch
9 00_all_0006-convert-PAGE_SIZE-usage.patch
10 00_all_0007-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
11 00_all_0008-unifdef-drop-unused-errno.h-include.patch
12 90_all_x32-3.2.patch
13 Log:
14 initial 3.2 patchset based on last 3.1 patchset
15
16 Revision Changes Path
17 1.1 src/patchsets/gentoo-headers/3.2/00_all_0001-kbuild-auto-convert-size-types-in-userspace-headers.patch
18
19 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0001-kbuild-auto-convert-size-types-in-userspace-headers.patch?rev=1.1&view=markup
20 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0001-kbuild-auto-convert-size-types-in-userspace-headers.patch?rev=1.1&content-type=text/plain
21
22 Index: 00_all_0001-kbuild-auto-convert-size-types-in-userspace-headers.patch
23 ===================================================================
24 From 67e13cb3835e984a1398c8636c4c26d2bac91596 Mon Sep 17 00:00:00 2001
25 From: Mike Frysinger <vapier@g.o>
26 Date: Mon, 29 Dec 2008 06:07:47 -0500
27 Subject: [PATCH] kbuild: auto-convert size types in userspace headers
28
29 Rather than constantly fixing up size type breakage in userspace headers,
30 auto convert the types u_intXX_t, uintXX_t, intXX_t, uXX, and sXX to the
31 appropriate __uXX or __sXX type.
32
33 Signed-off-by: Mike Frysinger <vapier@g.o>
34 ---
35 scripts/headers_install.pl | 3 +++
36 1 files changed, 3 insertions(+), 0 deletions(-)
37
38 diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
39 index 48462be..92101b9 100644
40 --- a/scripts/headers_install.pl
41 +++ b/scripts/headers_install.pl
42 @@ -40,6 +40,9 @@ foreach my $file (@files) {
43 $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
44 $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
45 $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
46 + $line =~ s/\b([us](8|16|32|64))\b/__$1/g;
47 + $line =~ s/\b(u_?int(8|16|32|64)_t)\b/__u$2/g;
48 + $line =~ s/\b(int(8|16|32|64)_t)\b/__s$2/g;
49 printf {$out} "%s", $line;
50 }
51 close $out;
52 --
53 1.7.6.1
54
55
56
57
58 1.1 src/patchsets/gentoo-headers/3.2/00_all_0002-linux-stat.h-remove-__GLIBC__-checks.patch
59
60 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0002-linux-stat.h-remove-__GLIBC__-checks.patch?rev=1.1&view=markup
61 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0002-linux-stat.h-remove-__GLIBC__-checks.patch?rev=1.1&content-type=text/plain
62
63 Index: 00_all_0002-linux-stat.h-remove-__GLIBC__-checks.patch
64 ===================================================================
65 From 23c414c8c84621ce601c886cfda5fcac52576e0e Mon Sep 17 00:00:00 2001
66 From: Mike Frysinger <vapier@g.o>
67 Date: Mon, 29 Dec 2008 06:52:59 -0500
68 Subject: [PATCH] linux/stat.h: remove __GLIBC__ checks
69
70 Only check __KERNEL__ so we don't assume the C library is glibc.
71
72 Signed-off-by: Mike Frysinger <vapier@g.o>
73 ---
74 include/linux/stat.h | 2 +-
75 1 files changed, 1 insertions(+), 1 deletions(-)
76
77 diff --git a/include/linux/stat.h b/include/linux/stat.h
78 index 611c398..5460344 100644
79 --- a/include/linux/stat.h
80 +++ b/include/linux/stat.h
81 @@ -7,7 +7,7 @@
82
83 #endif
84
85 -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
86 +#ifdef __KERNEL__
87
88 #define S_IFMT 00170000
89 #define S_IFSOCK 0140000
90 --
91 1.7.6.1
92
93
94
95
96 1.1 src/patchsets/gentoo-headers/3.2/00_all_0003-linux-stddef.h-export-offsetof-to-userspace.patch
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0003-linux-stddef.h-export-offsetof-to-userspace.patch?rev=1.1&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0003-linux-stddef.h-export-offsetof-to-userspace.patch?rev=1.1&content-type=text/plain
100
101 Index: 00_all_0003-linux-stddef.h-export-offsetof-to-userspace.patch
102 ===================================================================
103 From 573d78f37c21fe5ce80dce1ce955cd78537c2e43 Mon Sep 17 00:00:00 2001
104 From: Mike Frysinger <vapier@g.o>
105 Date: Fri, 2 Jan 2009 02:34:03 -0500
106 Subject: [PATCH] linux/stddef.h: export offsetof() to userspace
107
108 Some userspace headers (like fuse.h) utilize the offsetof() macro. Some
109 userspace packages (like lkcd) expect linux/stddef.h to provide this as
110 well.
111
112 Signed-off-by: Mike Frysinger <vapier@g.o>
113 ---
114 include/linux/stddef.h | 7 +++++--
115 1 files changed, 5 insertions(+), 2 deletions(-)
116
117 diff --git a/include/linux/stddef.h b/include/linux/stddef.h
118 index 6a40c76..4894d59 100644
119 --- a/include/linux/stddef.h
120 +++ b/include/linux/stddef.h
121 @@ -20,9 +20,12 @@ enum {
122 #undef offsetof
123 #ifdef __compiler_offsetof
124 #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
125 -#else
126 -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
127 #endif
128 #endif /* __KERNEL__ */
129
130 +#include <stddef.h> /* newer gcc includes this */
131 +#ifndef offsetof
132 +#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
133 +#endif
134 +
135 #endif
136 --
137 1.7.6.1
138
139
140
141
142 1.1 src/patchsets/gentoo-headers/3.2/00_all_0004-linux-pull-in-other-needed-headers-for-userspace.patch
143
144 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0004-linux-pull-in-other-needed-headers-for-userspace.patch?rev=1.1&view=markup
145 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0004-linux-pull-in-other-needed-headers-for-userspace.patch?rev=1.1&content-type=text/plain
146
147 Index: 00_all_0004-linux-pull-in-other-needed-headers-for-userspace.patch
148 ===================================================================
149 From 07acc7fe9a642bb2be0f934fe4d2a5e72bc83be9 Mon Sep 17 00:00:00 2001
150 From: Mike Frysinger <vapier@g.o>
151 Date: Mon, 29 Dec 2008 07:41:01 -0500
152 Subject: [PATCH] linux/*: pull in other needed headers for userspace
153
154 mondo patch
155
156 Signed-off-by: Mike Frysinger <vapier@g.o>
157 ---
158 include/linux/cm4000_cs.h | 1 +
159 include/linux/dn.h | 1 +
160 include/linux/if_ppp.h | 1 +
161 3 files changed, 3 insertions(+), 0 deletions(-)
162
163 diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
164 index 3c4aac4..ac230b6 100644
165 --- a/include/linux/cm4000_cs.h
166 +++ b/include/linux/cm4000_cs.h
167 @@ -2,6 +2,7 @@
168 #define _CM4000_H_
169
170 #include <linux/types.h>
171 +#include <linux/ioctl.h>
172
173 #define MAX_ATR 33
174
175 diff --git a/include/linux/dn.h b/include/linux/dn.h
176 index 9c50445..dc9f005 100644
177 --- a/include/linux/dn.h
178 +++ b/include/linux/dn.h
179 @@ -1,6 +1,7 @@
180 #ifndef _LINUX_DN_H
181 #define _LINUX_DN_H
182
183 +#include <linux/ioctl.h>
184 #include <linux/types.h>
185
186 /*
187 diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h
188 index c9ad383..4d70e16 100644
189 --- a/include/linux/if_ppp.h
190 +++ b/include/linux/if_ppp.h
191 @@ -35,6 +35,7 @@
192
193 #include <linux/types.h>
194 #include <linux/compiler.h>
195 +#include <linux/ppp_defs.h>
196
197 /*
198 * Packet sizes
199 --
200 1.7.6.1
201
202
203
204
205 1.1 src/patchsets/gentoo-headers/3.2/00_all_0005-netfilter-pull-in-limits.h.patch
206
207 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0005-netfilter-pull-in-limits.h.patch?rev=1.1&view=markup
208 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0005-netfilter-pull-in-limits.h.patch?rev=1.1&content-type=text/plain
209
210 Index: 00_all_0005-netfilter-pull-in-limits.h.patch
211 ===================================================================
212 From 327051eec20d0a19dcba38b22d5a4644af6de2ef Mon Sep 17 00:00:00 2001
213 From: Mike Frysinger <vapier@g.o>
214 Date: Sat, 9 May 2009 17:30:35 -0400
215 Subject: [PATCH] netfilter: pull in limits.h
216
217 A few netfilter sub-headers use INT_MAX which is in limits.h.
218
219 URL: http://bugs.gentoo.org/246160
220 Signed-off-by: Mike Frysinger <vapier@g.o>
221 ---
222 include/linux/netfilter.h | 1 +
223 1 files changed, 1 insertions(+), 0 deletions(-)
224
225 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
226 index 857f502..7f47d46 100644
227 --- a/include/linux/netfilter.h
228 +++ b/include/linux/netfilter.h
229 @@ -14,6 +14,7 @@
230 #include <linux/types.h>
231 #include <linux/compiler.h>
232 #include <linux/sysctl.h>
233 +#include <limits.h>
234
235 /* Responses from hook functions. */
236 #define NF_DROP 0
237 --
238 1.7.6.1
239
240
241
242
243 1.1 src/patchsets/gentoo-headers/3.2/00_all_0006-convert-PAGE_SIZE-usage.patch
244
245 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0006-convert-PAGE_SIZE-usage.patch?rev=1.1&view=markup
246 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0006-convert-PAGE_SIZE-usage.patch?rev=1.1&content-type=text/plain
247
248 Index: 00_all_0006-convert-PAGE_SIZE-usage.patch
249 ===================================================================
250 From 33f15f396dcfccc585adaf1157050f83e3f049d4 Mon Sep 17 00:00:00 2001
251 From: Mike Frysinger <vapier@g.o>
252 Date: Sat, 13 Feb 2010 03:09:23 -0500
253 Subject: [PATCH] convert PAGE_SIZE usage
254
255 The size of a page may change at runtime or based on kernel settings, so
256 a static value at compile time doesn't work. More importantly, no one
257 exports PAGE_SIZE to user space anymore.
258
259 URL: http://bugs.gentoo.org/301431
260 Signed-off-by: Mike Frysinger <vapier@g.o>
261 ---
262 include/linux/binfmts.h | 3 ++-
263 include/linux/resource.h | 3 ++-
264 2 files changed, 4 insertions(+), 2 deletions(-)
265
266 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
267 index fd88a39..dbe6719 100644
268 --- a/include/linux/binfmts.h
269 +++ b/include/linux/binfmts.h
270 @@ -1,6 +1,7 @@
271 #ifndef _LINUX_BINFMTS_H
272 #define _LINUX_BINFMTS_H
273
274 +#include <unistd.h>
275 #include <linux/capability.h>
276
277 struct pt_regs;
278 @@ -11,7 +12,7 @@ struct pt_regs;
279 * prevent the kernel from being unduly impacted by misaddressed pointers.
280 * MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer.
281 */
282 -#define MAX_ARG_STRLEN (PAGE_SIZE * 32)
283 +#define MAX_ARG_STRLEN (sysconf(_SC_PAGESIZE) * 32)
284 #define MAX_ARG_STRINGS 0x7FFFFFFF
285
286 /* sizeof(linux_binprm->buf) */
287 diff --git a/include/linux/resource.h b/include/linux/resource.h
288 index d01c96c..5a0559d 100644
289 --- a/include/linux/resource.h
290 +++ b/include/linux/resource.h
291 @@ -68,7 +68,8 @@ struct rlimit64 {
292 * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
293 * and other sensitive information are never written to disk.
294 */
295 -#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
296 +/* No one currently defines PAGE_SIZE bigger than 64kB */
297 +#define MLOCK_LIMIT (64 * 1024)
298
299 /*
300 * Due to binary compatibility, the actual resource numbers
301 --
302 1.7.6.1
303
304
305
306
307 1.1 src/patchsets/gentoo-headers/3.2/00_all_0007-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
308
309 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0007-asm-generic-fcntl.h-namespace-kernel-file-structs.patch?rev=1.1&view=markup
310 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0007-asm-generic-fcntl.h-namespace-kernel-file-structs.patch?rev=1.1&content-type=text/plain
311
312 Index: 00_all_0007-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
313 ===================================================================
314 From c9fe447c4cf5db1534ea702e6611013bc42a98e0 Mon Sep 17 00:00:00 2001
315 From: Mike Frysinger <vapier@g.o>
316 Date: Mon, 29 Dec 2008 07:39:14 -0500
317 Subject: [PATCH] asm-generic/fcntl.h: namespace kernel file structs
318
319 No one should be using these structs, but just in case they are,
320 keep them available in the __kernel_ namespace.
321
322 Otherwise, trying to include something like:
323 #include <fcntl.h>
324 #include <linux/inotify.h>
325 leads to horrible failure.
326
327 URL: http://bugs.gentoo.org/244470
328 URL: http://bugs.gentoo.org/388633
329 Signed-off-by: Mike Frysinger <vapier@g.o>
330 ---
331 include/asm-generic/fcntl.h | 6 +++---
332 1 files changed, 3 insertions(+), 3 deletions(-)
333
334 diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
335 index 9e5b035..fc2dba0 100644
336 --- a/include/asm-generic/fcntl.h
337 +++ b/include/asm-generic/fcntl.h
338 @@ -124,7 +124,7 @@
339 #define F_OWNER_PID 1
340 #define F_OWNER_PGRP 2
341
342 -struct f_owner_ex {
343 +struct __kernel_f_owner_ex {
344 int type;
345 __kernel_pid_t pid;
346 };
347 @@ -164,7 +164,7 @@ struct f_owner_ex {
348 #define __ARCH_FLOCK_PAD
349 #endif
350
351 -struct flock {
352 +struct __kernel_flock {
353 short l_type;
354 short l_whence;
355 __kernel_off_t l_start;
356 @@ -181,7 +181,7 @@ struct flock {
357 #define __ARCH_FLOCK64_PAD
358 #endif
359
360 -struct flock64 {
361 +struct __kernel_flock64 {
362 short l_type;
363 short l_whence;
364 __kernel_loff_t l_start;
365 --
366 1.7.6.1
367
368
369
370
371 1.1 src/patchsets/gentoo-headers/3.2/00_all_0008-unifdef-drop-unused-errno.h-include.patch
372
373 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0008-unifdef-drop-unused-errno.h-include.patch?rev=1.1&view=markup
374 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/00_all_0008-unifdef-drop-unused-errno.h-include.patch?rev=1.1&content-type=text/plain
375
376 Index: 00_all_0008-unifdef-drop-unused-errno.h-include.patch
377 ===================================================================
378 From e3d85878dbc208a60a342420d50ae631e30a3cf9 Mon Sep 17 00:00:00 2001
379 From: Mike Frysinger <vapier@g.o>
380 Date: Tue, 6 Dec 2011 17:22:42 -0500
381 Subject: [PATCH] unifdef: drop unused errno.h include
382
383 This is the only header on my system that ends up requiring kernel
384 headers, so if the kernel headers aren't available, we end up being
385 unable to install kernel headers :).
386
387 Since this file doesn't actually use anything from errno.h, drop
388 the include so it at least makes us a bit more robust on glibc.
389
390 Signed-off-by: Mike Frysinger <vapier@g.o>
391 ---
392 scripts/unifdef.c | 1 -
393 1 files changed, 0 insertions(+), 1 deletions(-)
394
395 diff --git a/scripts/unifdef.c b/scripts/unifdef.c
396 index 7493c0e..c5dfae5 100644
397 --- a/scripts/unifdef.c
398 +++ b/scripts/unifdef.c
399 @@ -48,7 +48,6 @@
400
401 #include <ctype.h>
402 #include <err.h>
403 -#include <errno.h>
404 #include <stdarg.h>
405 #include <stdbool.h>
406 #include <stdio.h>
407 --
408 1.7.6.1
409
410
411
412
413 1.1 src/patchsets/gentoo-headers/3.2/90_all_x32-3.2.patch
414
415 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/90_all_x32-3.2.patch?rev=1.1&view=markup
416 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.2/90_all_x32-3.2.patch?rev=1.1&content-type=text/plain
417
418 Index: 90_all_x32-3.2.patch
419 ===================================================================
420 add x32 support; patch from https://github.com/hjl-tools/linux
421
422 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
423 index b02e509..9083bf23 100644
424 --- a/arch/x86/Makefile
425 +++ b/arch/x86/Makefile
426 @@ -157,7 +157,7 @@ all: bzImage
427 # KBUILD_IMAGE specify target image being built
428 KBUILD_IMAGE := $(boot)/bzImage
429
430 -bzImage: vmlinux
431 +bzImage: vmlinux arch/x86/include/asm/unistd_x32.h
432 ifeq ($(CONFIG_X86_DECODER_SELFTEST),y)
433 $(Q)$(MAKE) $(build)=arch/x86/tools posttest
434 endif
435 @@ -176,6 +176,11 @@ PHONY += vdso_install
436 vdso_install:
437 $(Q)$(MAKE) $(build)=arch/x86/vdso $@
438
439 +arch/x86/include/asm/unistd_x32.h: arch/x86/include/asm/unistd_64.h
440 + sed -e "s/_NR_x32_/_NR_/g" \
441 + -e "s/_ASM_X86_UNISTD_64_H/_ASM_X86_UNISTD_X32_H/g" \
442 + $^ | grep -v "__NR_64_" > $@
443 +
444 archclean:
445 $(Q)rm -rf $(objtree)/arch/i386
446 $(Q)rm -rf $(objtree)/arch/x86_64
447 diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
448 index 6fa90a8..8d36523 100644
449 --- a/arch/x86/include/asm/Kbuild
450 +++ b/arch/x86/include/asm/Kbuild
451 @@ -21,5 +21,6 @@ header-y += sigcontext32.h
452 header-y += ucontext.h
453 header-y += unistd_32.h
454 header-y += unistd_64.h
455 +header-y += unistd_x32.h
456 header-y += vm86.h
457 header-y += vsyscall.h
458 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
459 index 30d737e..f6bf9ca 100644
460 --- a/arch/x86/include/asm/compat.h
461 +++ b/arch/x86/include/asm/compat.h
462 @@ -6,7 +6,12 @@
463 */
464 #include <linux/types.h>
465 #include <linux/sched.h>
466 +#include <linux/percpu.h>
467 +#include <asm/processor.h>
468 #include <asm/user32.h>
469 +#ifdef CONFIG_X86_X32_ABI
470 +#include <asm/unistd.h>
471 +#endif
472
473 #define COMPAT_USER_HZ 100
474 #define COMPAT_UTS_MACHINE "i686\0\0"
475 @@ -186,7 +191,20 @@ struct compat_shmid64_ds {
476 /*
477 * The type of struct elf_prstatus.pr_reg in compatible core dumps.
478 */
479 +#ifdef CONFIG_X86_X32_ABI
480 +typedef struct user_regs_struct compat_elf_gregset_t;
481 +
482 +#define PR_REG_SIZE(S) (test_thread_flag(TIF_IA32) ? 68 : 216)
483 +#define PRSTATUS_SIZE(S) (test_thread_flag(TIF_IA32) ? 144 : 296)
484 +#define SET_PR_FPVALID(S,V) \
485 + do { *(int *) (((void *) &((S)->pr_reg)) + PR_REG_SIZE(0)) = (V); } \
486 + while (0)
487 +
488 +#define COMPAT_USE_64BIT_TIME \
489 + ((task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT) != 0)
490 +#else
491 typedef struct user_regs_struct32 compat_elf_gregset_t;
492 +#endif
493
494 /*
495 * A pointer passed in from user mode. This should not
496 @@ -208,13 +226,29 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
497
498 static inline void __user *arch_compat_alloc_user_space(long len)
499 {
500 +#ifdef CONFIG_X86_X32_ABI
501 + compat_uptr_t sp;
502 +
503 + if (test_thread_flag(TIF_IA32))
504 + sp = task_pt_regs(current)->sp;
505 + else
506 + sp = percpu_read(old_rsp);
507 +
508 + /* -128 for the x32 ABI redzone */
509 + return (void __user *)round_down(sp - len - 128, 16);
510 +#else
511 struct pt_regs *regs = task_pt_regs(current);
512 return (void __user *)regs->sp - len;
513 +#endif
514 }
515
516 static inline int is_compat_task(void)
517 {
518 - return current_thread_info()->status & TS_COMPAT;
519 + return (current_thread_info()->status & TS_COMPAT)
520 +#ifdef CONFIG_X86_X32_ABI
521 + || (task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT)
522 +#endif
523 + ;
524 }
525
526 #endif /* _ASM_X86_COMPAT_H */
527 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
528 index 5f962df..83aabea 100644
529 --- a/arch/x86/include/asm/elf.h
530 +++ b/arch/x86/include/asm/elf.h
531 @@ -156,7 +156,12 @@ do { \
532 #define elf_check_arch(x) \
533 ((x)->e_machine == EM_X86_64)
534
535 -#define compat_elf_check_arch(x) elf_check_arch_ia32(x)
536 +#define compat_elf_check_arch(x) \
537 + (elf_check_arch_ia32(x) || (x)->e_machine == EM_X86_64)
538 +
539 +#if __USER32_DS != __USER_DS
540 +# error "The following code assumes __USER32_DS == __USER_DS"
541 +#endif
542
543 static inline void elf_common_init(struct thread_struct *t,
544 struct pt_regs *regs, const u16 ds)
545 @@ -179,8 +184,9 @@ static inline void elf_common_init(struct thread_struct *t,
546 void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp);
547 #define compat_start_thread start_thread_ia32
548
549 -void set_personality_ia32(void);
550 -#define COMPAT_SET_PERSONALITY(ex) set_personality_ia32()
551 +void set_personality_ia32(bool);
552 +#define COMPAT_SET_PERSONALITY(ex) \
553 + set_personality_ia32((ex).e_machine == EM_X86_64)
554
555 #define COMPAT_ELF_PLATFORM ("i686")
556
557 @@ -287,7 +293,7 @@ do { \
558 #define VDSO_HIGH_BASE 0xffffe000U /* CONFIG_COMPAT_VDSO address */
559
560 /* 1GB for 64bit, 8MB for 32bit */
561 -#define STACK_RND_MASK (test_thread_flag(TIF_IA32) ? 0x7ff : 0x3fffff)
562 +#define STACK_RND_MASK (test_thread_flag(TIF_ADDR32) ? 0x7ff : 0x3fffff)
563
564 #define ARCH_DLINFO \
565 do { \
566 @@ -296,9 +302,20 @@ do { \
567 (unsigned long)current->mm->context.vdso); \
568 } while (0)
569
570 +#define ARCH_DLINFO_X32 \
571 +do { \
572 + if (vdso_enabled) \
573 + NEW_AUX_ENT(AT_SYSINFO_EHDR, \
574 + (unsigned long)current->mm->context.vdso); \
575 +} while (0)
576 +
577 #define AT_SYSINFO 32
578
579 -#define COMPAT_ARCH_DLINFO ARCH_DLINFO_IA32(sysctl_vsyscall32)
580 +#define COMPAT_ARCH_DLINFO \
581 +if (test_thread_flag(TIF_X32)) \
582 + ARCH_DLINFO_X32; \
583 +else \
584 + ARCH_DLINFO_IA32(sysctl_vsyscall32)
585
586 #define COMPAT_ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
587
588 @@ -330,7 +347,7 @@ static inline int mmap_is_ia32(void)
589 return 1;
590 #endif
591 #ifdef CONFIG_IA32_EMULATION
592 - if (test_thread_flag(TIF_IA32))
593 + if (test_thread_flag(TIF_ADDR32))
594 return 1;
595 #endif
596 return 0;
597 diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
598 index 1f7e625..c6435ab 100644
599 --- a/arch/x86/include/asm/ia32.h
600 +++ b/arch/x86/include/asm/ia32.h
601 @@ -43,6 +43,15 @@ struct ucontext_ia32 {
602 compat_sigset_t uc_sigmask; /* mask last for extensibility */
603 };
604
605 +struct ucontext_x32 {
606 + unsigned int uc_flags;
607 + unsigned int uc_link;
608 + stack_ia32_t uc_stack;
609 + unsigned int uc__pad0; /* needed for alignment */
610 + struct sigcontext uc_mcontext; /* the 64-bit sigcontext type */
611 + compat_sigset_t uc_sigmask; /* mask last for extensibility */
612 +};
613 +
614 /* This matches struct stat64 in glibc2.2, hence the absolutely
615 * insane amounts of padding around dev_t's.
616 */
617 diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h
618 index 4365ffd..300cdcd 100644
619 --- a/arch/x86/include/asm/mtrr.h
620 +++ b/arch/x86/include/asm/mtrr.h
621 @@ -40,7 +40,7 @@ struct mtrr_sentry {
622 But you need to use this for 64bit, otherwise your X server
623 will break. */
624
625 -#ifdef __i386__
626 +#ifndef __LP64__
627 struct mtrr_gentry {
628 unsigned int regnum; /* Register number */
629 unsigned long base; /* Base address */
630 @@ -48,7 +48,7 @@ struct mtrr_gentry {
631 unsigned int type; /* Type of region */
632 };
633
634 -#else /* __i386__ */
635 +#else /* !__LP64__ */
636
637 struct mtrr_gentry {
638 unsigned long base; /* Base address */
639 @@ -56,7 +56,7 @@ struct mtrr_gentry {
640 unsigned int regnum; /* Register number */
641 unsigned int type; /* Type of region */
642 };
643 -#endif /* !__i386__ */
644 +#endif /* __LP64__ */
645
646 struct mtrr_var_range {
647 __u32 base_lo;
648 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
649 index b650435..11c7c38 100644
650 --- a/arch/x86/include/asm/processor.h
651 +++ b/arch/x86/include/asm/processor.h
652 @@ -926,9 +926,9 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
653 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
654 0xc0000000 : 0xFFFFe000)
655
656 -#define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
657 +#define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
658 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
659 -#define TASK_SIZE_OF(child) ((test_tsk_thread_flag(child, TIF_IA32)) ? \
660 +#define TASK_SIZE_OF(child) ((test_tsk_thread_flag(child, TIF_ADDR32)) ? \
661 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
662
663 #define STACK_TOP TASK_SIZE
664 @@ -950,6 +950,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
665
666 #define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1)
667 extern unsigned long KSTK_ESP(struct task_struct *task);
668 +
669 +/*
670 + * User space RSP while inside the SYSCALL fast path
671 + */
672 +DECLARE_PER_CPU(unsigned long, old_rsp);
673 #endif /* CONFIG_X86_64 */
674
675 extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
676 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
677 index 3566454..dcb2aac 100644
678 --- a/arch/x86/include/asm/ptrace.h
679 +++ b/arch/x86/include/asm/ptrace.h
680 @@ -67,30 +67,30 @@ struct pt_regs {
681 #ifndef __KERNEL__
682
683 struct pt_regs {
684 - unsigned long r15;
685 - unsigned long r14;
686 - unsigned long r13;
687 - unsigned long r12;
688 - unsigned long rbp;
689 - unsigned long rbx;
690 + __u64 r15;
691 + __u64 r14;
692 + __u64 r13;
693 + __u64 r12;
694 + __u64 rbp;
695 + __u64 rbx;
696 /* arguments: non interrupts/non tracing syscalls only save up to here*/
697 - unsigned long r11;
698 - unsigned long r10;
699 - unsigned long r9;
700 - unsigned long r8;
701 - unsigned long rax;
702 - unsigned long rcx;
703 - unsigned long rdx;
704 - unsigned long rsi;
705 - unsigned long rdi;
706 - unsigned long orig_rax;
707 + __u64 r11;
708 + __u64 r10;
709 + __u64 r9;
710 + __u64 r8;
711 + __u64 rax;
712 + __u64 rcx;
713 + __u64 rdx;
714 + __u64 rsi;
715 + __u64 rdi;
716 + __u64 orig_rax;
717 /* end of arguments */
718 /* cpu exception frame or undefined */
719 - unsigned long rip;
720 - unsigned long cs;
721 - unsigned long eflags;
722 - unsigned long rsp;
723 - unsigned long ss;
724 + __u64 rip;
725 + __u64 cs;
726 + __u64 eflags;
727 + __u64 rsp;
728 + __u64 ss;
729 /* top of stack page */
730 };
731
732 diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h
733 index 04459d2..4a08538 100644
734 --- a/arch/x86/include/asm/sigcontext.h
735 +++ b/arch/x86/include/asm/sigcontext.h
736 @@ -230,34 +230,37 @@ struct sigcontext {
737 * User-space might still rely on the old definition:
738 */
739 struct sigcontext {
740 - unsigned long r8;
741 - unsigned long r9;
742 - unsigned long r10;
743 - unsigned long r11;
744 - unsigned long r12;
745 - unsigned long r13;
746 - unsigned long r14;
747 - unsigned long r15;
748 - unsigned long rdi;
749 - unsigned long rsi;
750 - unsigned long rbp;
751 - unsigned long rbx;
752 - unsigned long rdx;
753 - unsigned long rax;
754 - unsigned long rcx;
755 - unsigned long rsp;
756 - unsigned long rip;
757 - unsigned long eflags; /* RFLAGS */
758 - unsigned short cs;
759 - unsigned short gs;
760 - unsigned short fs;
761 - unsigned short __pad0;
762 - unsigned long err;
763 - unsigned long trapno;
764 - unsigned long oldmask;
765 - unsigned long cr2;
766 + __u64 r8;
767 + __u64 r9;
768 + __u64 r10;
769 + __u64 r11;
770 + __u64 r12;
771 + __u64 r13;
772 + __u64 r14;
773 + __u64 r15;
774 + __u64 rdi;
775 + __u64 rsi;
776 + __u64 rbp;
777 + __u64 rbx;
778 + __u64 rdx;
779 + __u64 rax;
780 + __u64 rcx;
781 + __u64 rsp;
782 + __u64 rip;
783 + __u64 eflags; /* RFLAGS */
784 + __u16 cs;
785 + __u16 gs;
786 + __u16 fs;
787 + __u16 __pad0;
788 + __u64 err;
789 + __u64 trapno;
790 + __u64 oldmask;
791 + __u64 cr2;
792 struct _fpstate __user *fpstate; /* zero when no FPU context */
793 - unsigned long reserved1[8];
794 +#ifndef __LP64__
795 + __u32 __fpstate_pad;
796 +#endif
797 + __u64 reserved1[8];
798 };
799 #endif /* !__KERNEL__ */
800
801 diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
802 index 4e0fe26..22cfab8 100644
803 --- a/arch/x86/include/asm/sigframe.h
804 +++ b/arch/x86/include/asm/sigframe.h
805 @@ -59,6 +59,17 @@ struct rt_sigframe_ia32 {
806 #endif /* defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) */
807
808 #ifdef CONFIG_X86_64
809 +
810 +#ifdef CONFIG_X86_X32_ABI
811 +struct rt_sigframe_x32 {
812 + u64 pretcode;
813 + struct ucontext_x32 uc;
814 + compat_siginfo_t info;
815 + /* fp state follows here */
816 +};
817 +
818 +#endif /* CONFIG_X86_X32_ABI */
819 +
820 struct rt_sigframe {
821 char __user *pretcode;
822 struct ucontext uc;
823 diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
824 index c4a348f..2f44f27b 100644
825 --- a/arch/x86/include/asm/syscall.h
826 +++ b/arch/x86/include/asm/syscall.h
827 @@ -15,6 +15,9 @@
828
829 #include <linux/sched.h>
830 #include <linux/err.h>
831 +#ifdef CONFIG_X86_X32_ABI
832 +#include <asm/unistd.h>
833 +#endif
834
835 extern const unsigned long sys_call_table[];
836
837 @@ -25,13 +28,21 @@ extern const unsigned long sys_call_table[];
838 */
839 static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs)
840 {
841 - return regs->orig_ax;
842 + return regs->orig_ax
843 +#ifdef CONFIG_X86_X32_ABI
844 + & ~__X32_SYSCALL_BIT
845 +#endif
846 + ;
847 }
848
849 static inline void syscall_rollback(struct task_struct *task,
850 struct pt_regs *regs)
851 {
852 - regs->ax = regs->orig_ax;
853 + regs->ax = regs->orig_ax
854 +#ifdef CONFIG_X86_X32_ABI
855 + & ~__X32_SYSCALL_BIT
856 +#endif
857 + ;
858 }
859
860 static inline long syscall_get_error(struct task_struct *task,
861 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
862 index a1fe5c1..4e076b0 100644
863 --- a/arch/x86/include/asm/thread_info.h
864 +++ b/arch/x86/include/asm/thread_info.h
865 @@ -85,7 +85,7 @@ struct thread_info {
866 #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */
867 #define TIF_USER_RETURN_NOTIFY 11 /* notify kernel of userspace return */
868 #define TIF_NOTSC 16 /* TSC is not accessible in userland */
869 -#define TIF_IA32 17 /* 32bit process */
870 +#define TIF_IA32 17 /* ia32 process */
871 #define TIF_FORK 18 /* ret_from_fork */
872 #define TIF_MEMDIE 20 /* is terminating due to OOM killer */
873 #define TIF_DEBUG 21 /* uses debug registers */
874 @@ -95,6 +95,8 @@ struct thread_info {
875 #define TIF_BLOCKSTEP 25 /* set when we want DEBUGCTLMSR_BTF */
876 #define TIF_LAZY_MMU_UPDATES 27 /* task is updating the mmu lazily */
877 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
878 +#define TIF_ADDR32 29 /* 32bit process */
879 +#define TIF_X32 30 /* 32-bit native x86-64 binary */
880
881 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
882 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
883 @@ -117,6 +119,8 @@ struct thread_info {
884 #define _TIF_BLOCKSTEP (1 << TIF_BLOCKSTEP)
885 #define _TIF_LAZY_MMU_UPDATES (1 << TIF_LAZY_MMU_UPDATES)
886 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
887 +#define _TIF_ADDR32 (1 << TIF_ADDR32)
888 +#define _TIF_X32 (1 << TIF_X32)
889
890 /* work to do in syscall_trace_enter() */
891 #define _TIF_WORK_SYSCALL_ENTRY \
892 diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
893 index 8e8c23f..f013125 100644
894 --- a/arch/x86/include/asm/types.h
895 +++ b/arch/x86/include/asm/types.h
896 @@ -1,6 +1,12 @@
897 #ifndef _ASM_X86_TYPES_H
898 #define _ASM_X86_TYPES_H
899
900 +#if defined __x86_64__ && !defined __LP64__
901 +#define __KERNEL_NATIVE_LONG_TYPE long long
902 +#else
903 +#define __KERNEL_NATIVE_LONG_TYPE long
904 +#endif
905 +
906 #include <asm-generic/types.h>
907
908 #endif /* _ASM_X86_TYPES_H */
909 diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h
910 index 2a58ed3..e9c1b26 100644
911 --- a/arch/x86/include/asm/unistd.h
912 +++ b/arch/x86/include/asm/unistd.h
913 @@ -3,11 +3,14 @@
914 # include "unistd_32.h"
915 # else
916 # include "unistd_64.h"
917 +# include "unistd_64_compat.h"
918 # endif
919 #else
920 # ifdef __i386__
921 # include "unistd_32.h"
922 -# else
923 +# elif __LP64__
924 # include "unistd_64.h"
925 +# else
926 +# include "unistd_x32.h"
927 # endif
928 #endif
929 diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h
930 index 0431f19..f59b665 100644
931 --- a/arch/x86/include/asm/unistd_64.h
932 +++ b/arch/x86/include/asm/unistd_64.h
933 @@ -5,6 +5,28 @@
934 #define __SYSCALL(a, b)
935 #endif
936
937 +#ifndef __X32_SYSCALL
938 +#define __X32_SYSCALL(a, b)
939 +#endif
940 +
941 +/* X32 system call mask. */
942 +#define __X32_SYSCALL_BIT 0x40000000
943 +
944 +/* The first x32 system call. */
945 +#define __X32_SYSCALL_BASE 512
946 +
947 +#ifdef __KERNEL__
948 +#define __NR_COMMON_SYSCALL(n) (n)
949 +#define __NR_X32_SYSCALL(n) (__X32_SYSCALL_BASE + n)
950 +#else
951 +#if __LP64__
952 +#define __NR_COMMON_SYSCALL(n) (n)
953 +#else
954 +#define __NR_COMMON_SYSCALL(n) (__X32_SYSCALL_BIT | (n))
955 +#endif
956 +#define __NR_X32_SYSCALL(n) (__X32_SYSCALL_BIT | (__X32_SYSCALL_BASE + n))
957 +#endif
958 +
959 /*
960 * This file contains the system call numbers.
961 *
962 @@ -12,680 +34,745 @@
963 */
964
965 /* at least 8 syscall per cacheline */
966 -#define __NR_read 0
967 +#define __NR_read __NR_COMMON_SYSCALL(0)
968 __SYSCALL(__NR_read, sys_read)
969 -#define __NR_write 1
970 +#define __NR_write __NR_COMMON_SYSCALL(1)
971 __SYSCALL(__NR_write, sys_write)
972 -#define __NR_open 2
973 +#define __NR_open __NR_COMMON_SYSCALL(2)
974 __SYSCALL(__NR_open, sys_open)
975 -#define __NR_close 3
976 +#define __NR_close __NR_COMMON_SYSCALL(3)
977 __SYSCALL(__NR_close, sys_close)
978 -#define __NR_stat 4
979 +#define __NR_stat __NR_COMMON_SYSCALL(4)
980 __SYSCALL(__NR_stat, sys_newstat)
981 -#define __NR_fstat 5
982 +#define __NR_fstat __NR_COMMON_SYSCALL(5)
983 __SYSCALL(__NR_fstat, sys_newfstat)
984 -#define __NR_lstat 6
985 +#define __NR_lstat __NR_COMMON_SYSCALL(6)
986 __SYSCALL(__NR_lstat, sys_newlstat)
987 -#define __NR_poll 7
988 +#define __NR_poll __NR_COMMON_SYSCALL(7)
989 __SYSCALL(__NR_poll, sys_poll)
990
991 -#define __NR_lseek 8
992 +#define __NR_lseek __NR_COMMON_SYSCALL(8)
993 __SYSCALL(__NR_lseek, sys_lseek)
994 -#define __NR_mmap 9
995 +#define __NR_mmap __NR_COMMON_SYSCALL(9)
996 __SYSCALL(__NR_mmap, sys_mmap)
997 -#define __NR_mprotect 10
998 +#define __NR_mprotect __NR_COMMON_SYSCALL(10)
999 __SYSCALL(__NR_mprotect, sys_mprotect)
1000 -#define __NR_munmap 11
1001 +#define __NR_munmap __NR_COMMON_SYSCALL(11)
1002 __SYSCALL(__NR_munmap, sys_munmap)
1003 -#define __NR_brk 12
1004 +#define __NR_brk __NR_COMMON_SYSCALL(12)
1005 __SYSCALL(__NR_brk, sys_brk)
1006 -#define __NR_rt_sigaction 13
1007 -__SYSCALL(__NR_rt_sigaction, sys_rt_sigaction)
1008 -#define __NR_rt_sigprocmask 14
1009 -__SYSCALL(__NR_rt_sigprocmask, sys_rt_sigprocmask)
1010 -#define __NR_rt_sigreturn 15
1011 -__SYSCALL(__NR_rt_sigreturn, stub_rt_sigreturn)
1012 -
1013 -#define __NR_ioctl 16
1014 -__SYSCALL(__NR_ioctl, sys_ioctl)
1015 -#define __NR_pread64 17
1016 +#define __NR_64_rt_sigaction 13
1017 +__SYSCALL(__NR_64_rt_sigaction, sys_rt_sigaction)
1018 +#define __NR_64_rt_sigprocmask 14
1019 +__SYSCALL(__NR_64_rt_sigprocmask, sys_rt_sigprocmask)
1020 +#define __NR_64_rt_sigreturn 15
1021 +__SYSCALL(__NR_64_rt_sigreturn, stub_rt_sigreturn)
1022 +
1023 +#define __NR_64_ioctl 16
1024 +__SYSCALL(__NR_64_ioctl, sys_ioctl)
1025 +#define __NR_pread64 __NR_COMMON_SYSCALL(17)
1026 __SYSCALL(__NR_pread64, sys_pread64)
1027 -#define __NR_pwrite64 18
1028 +#define __NR_pwrite64 __NR_COMMON_SYSCALL(18)
1029 __SYSCALL(__NR_pwrite64, sys_pwrite64)
1030 -#define __NR_readv 19
1031 -__SYSCALL(__NR_readv, sys_readv)
1032 -#define __NR_writev 20
1033 -__SYSCALL(__NR_writev, sys_writev)
1034 -#define __NR_access 21
1035 +#define __NR_64_readv 19
1036 +__SYSCALL(__NR_64_readv, sys_readv)
1037 +#define __NR_64_writev 20
1038 +__SYSCALL(__NR_64_writev, sys_writev)
1039 +#define __NR_access __NR_COMMON_SYSCALL(21)
1040 __SYSCALL(__NR_access, sys_access)
1041 -#define __NR_pipe 22
1042 +#define __NR_pipe __NR_COMMON_SYSCALL(22)
1043 __SYSCALL(__NR_pipe, sys_pipe)
1044 -#define __NR_select 23
1045 +#define __NR_select __NR_COMMON_SYSCALL(23)
1046 __SYSCALL(__NR_select, sys_select)
1047
1048 -#define __NR_sched_yield 24
1049 +#define __NR_sched_yield __NR_COMMON_SYSCALL(24)
1050 __SYSCALL(__NR_sched_yield, sys_sched_yield)
1051 -#define __NR_mremap 25
1052 +#define __NR_mremap __NR_COMMON_SYSCALL(25)
1053 __SYSCALL(__NR_mremap, sys_mremap)
1054 -#define __NR_msync 26
1055 +#define __NR_msync __NR_COMMON_SYSCALL(26)
1056 __SYSCALL(__NR_msync, sys_msync)
1057 -#define __NR_mincore 27
1058 +#define __NR_mincore __NR_COMMON_SYSCALL(27)
1059 __SYSCALL(__NR_mincore, sys_mincore)
1060 -#define __NR_madvise 28
1061 +#define __NR_madvise __NR_COMMON_SYSCALL(28)
1062 __SYSCALL(__NR_madvise, sys_madvise)
1063 -#define __NR_shmget 29
1064 +#define __NR_shmget __NR_COMMON_SYSCALL(29)
1065 __SYSCALL(__NR_shmget, sys_shmget)
1066 -#define __NR_shmat 30
1067 +#define __NR_shmat __NR_COMMON_SYSCALL(30)
1068 __SYSCALL(__NR_shmat, sys_shmat)
1069 -#define __NR_shmctl 31
1070 +#define __NR_shmctl __NR_COMMON_SYSCALL(31)
1071 __SYSCALL(__NR_shmctl, sys_shmctl)
1072
1073 -#define __NR_dup 32
1074 +#define __NR_dup __NR_COMMON_SYSCALL(32)
1075 __SYSCALL(__NR_dup, sys_dup)
1076 -#define __NR_dup2 33
1077 +#define __NR_dup2 __NR_COMMON_SYSCALL(33)
1078 __SYSCALL(__NR_dup2, sys_dup2)
1079 -#define __NR_pause 34
1080 +#define __NR_pause __NR_COMMON_SYSCALL(34)
1081 __SYSCALL(__NR_pause, sys_pause)
1082 -#define __NR_nanosleep 35
1083 +#define __NR_nanosleep __NR_COMMON_SYSCALL(35)
1084 __SYSCALL(__NR_nanosleep, sys_nanosleep)
1085 -#define __NR_getitimer 36
1086 +#define __NR_getitimer __NR_COMMON_SYSCALL(36)
1087 __SYSCALL(__NR_getitimer, sys_getitimer)
1088 -#define __NR_alarm 37
1089 +#define __NR_alarm __NR_COMMON_SYSCALL(37)
1090 __SYSCALL(__NR_alarm, sys_alarm)
1091 -#define __NR_setitimer 38
1092 +#define __NR_setitimer __NR_COMMON_SYSCALL(38)
1093 __SYSCALL(__NR_setitimer, sys_setitimer)
1094 -#define __NR_getpid 39
1095 +#define __NR_getpid __NR_COMMON_SYSCALL(39)
1096 __SYSCALL(__NR_getpid, sys_getpid)
1097
1098 -#define __NR_sendfile 40
1099 +#define __NR_sendfile __NR_COMMON_SYSCALL(40)
1100 __SYSCALL(__NR_sendfile, sys_sendfile64)
1101 -#define __NR_socket 41
1102 +#define __NR_socket __NR_COMMON_SYSCALL(41)
1103 __SYSCALL(__NR_socket, sys_socket)
1104 -#define __NR_connect 42
1105 +#define __NR_connect __NR_COMMON_SYSCALL(42)
1106 __SYSCALL(__NR_connect, sys_connect)
1107 -#define __NR_accept 43
1108 +#define __NR_accept __NR_COMMON_SYSCALL(43)
1109 __SYSCALL(__NR_accept, sys_accept)
1110 -#define __NR_sendto 44
1111 +#define __NR_sendto __NR_COMMON_SYSCALL(44)
1112 __SYSCALL(__NR_sendto, sys_sendto)
1113 -#define __NR_recvfrom 45
1114 -__SYSCALL(__NR_recvfrom, sys_recvfrom)
1115 -#define __NR_sendmsg 46
1116 -__SYSCALL(__NR_sendmsg, sys_sendmsg)
1117 -#define __NR_recvmsg 47
1118 -__SYSCALL(__NR_recvmsg, sys_recvmsg)
1119 -
1120 -#define __NR_shutdown 48
1121 +#define __NR_64_recvfrom 45
1122 +__SYSCALL(__NR_64_recvfrom, sys_recvfrom)
1123 +#define __NR_64_sendmsg 46
1124 +__SYSCALL(__NR_64_sendmsg, sys_sendmsg)
1125 +#define __NR_64_recvmsg 47
1126 +__SYSCALL(__NR_64_recvmsg, sys_recvmsg)
1127 +
1128 +#define __NR_shutdown __NR_COMMON_SYSCALL(48)
1129 __SYSCALL(__NR_shutdown, sys_shutdown)
1130 -#define __NR_bind 49
1131 +#define __NR_bind __NR_COMMON_SYSCALL(49)
1132 __SYSCALL(__NR_bind, sys_bind)
1133 -#define __NR_listen 50
1134 +#define __NR_listen __NR_COMMON_SYSCALL(50)
1135 __SYSCALL(__NR_listen, sys_listen)
1136 -#define __NR_getsockname 51
1137 +#define __NR_getsockname __NR_COMMON_SYSCALL(51)
1138 __SYSCALL(__NR_getsockname, sys_getsockname)
1139 -#define __NR_getpeername 52
1140 +#define __NR_getpeername __NR_COMMON_SYSCALL(52)
1141 __SYSCALL(__NR_getpeername, sys_getpeername)
1142 -#define __NR_socketpair 53
1143 +#define __NR_socketpair __NR_COMMON_SYSCALL(53)
1144 __SYSCALL(__NR_socketpair, sys_socketpair)
1145 -#define __NR_setsockopt 54
1146 +#define __NR_setsockopt __NR_COMMON_SYSCALL(54)
1147 __SYSCALL(__NR_setsockopt, sys_setsockopt)
1148 -#define __NR_getsockopt 55
1149 +#define __NR_getsockopt __NR_COMMON_SYSCALL(55)
1150 __SYSCALL(__NR_getsockopt, sys_getsockopt)
1151
1152 -#define __NR_clone 56
1153 +#define __NR_clone __NR_COMMON_SYSCALL(56)
1154 __SYSCALL(__NR_clone, stub_clone)
1155 -#define __NR_fork 57
1156 +#define __NR_fork __NR_COMMON_SYSCALL(57)
1157 __SYSCALL(__NR_fork, stub_fork)
1158 -#define __NR_vfork 58
1159 +#define __NR_vfork __NR_COMMON_SYSCALL(58)
1160 __SYSCALL(__NR_vfork, stub_vfork)
1161 -#define __NR_execve 59
1162 -__SYSCALL(__NR_execve, stub_execve)
1163 -#define __NR_exit 60
1164 +#define __NR_64_execve 59
1165 +__SYSCALL(__NR_64_execve, stub_execve)
1166 +#define __NR_exit __NR_COMMON_SYSCALL(60)
1167 __SYSCALL(__NR_exit, sys_exit)
1168 -#define __NR_wait4 61
1169 +#define __NR_wait4 __NR_COMMON_SYSCALL(61)
1170 __SYSCALL(__NR_wait4, sys_wait4)
1171 -#define __NR_kill 62
1172 +#define __NR_kill __NR_COMMON_SYSCALL(62)
1173 __SYSCALL(__NR_kill, sys_kill)
1174 -#define __NR_uname 63
1175 +#define __NR_uname __NR_COMMON_SYSCALL(63)
1176 __SYSCALL(__NR_uname, sys_newuname)
1177
1178 -#define __NR_semget 64
1179 +#define __NR_semget __NR_COMMON_SYSCALL(64)
1180 __SYSCALL(__NR_semget, sys_semget)
1181 -#define __NR_semop 65
1182 +#define __NR_semop __NR_COMMON_SYSCALL(65)
1183 __SYSCALL(__NR_semop, sys_semop)
1184 -#define __NR_semctl 66
1185 +#define __NR_semctl __NR_COMMON_SYSCALL(66)
1186 __SYSCALL(__NR_semctl, sys_semctl)
1187 -#define __NR_shmdt 67
1188 +#define __NR_shmdt __NR_COMMON_SYSCALL(67)
1189 __SYSCALL(__NR_shmdt, sys_shmdt)
1190 -#define __NR_msgget 68
1191 +#define __NR_msgget __NR_COMMON_SYSCALL(68)
1192 __SYSCALL(__NR_msgget, sys_msgget)
1193 -#define __NR_msgsnd 69
1194 +#define __NR_msgsnd __NR_COMMON_SYSCALL(69)
1195 __SYSCALL(__NR_msgsnd, sys_msgsnd)
1196 -#define __NR_msgrcv 70
1197 +#define __NR_msgrcv __NR_COMMON_SYSCALL(70)
1198 __SYSCALL(__NR_msgrcv, sys_msgrcv)
1199 -#define __NR_msgctl 71
1200 +#define __NR_msgctl __NR_COMMON_SYSCALL(71)
1201 __SYSCALL(__NR_msgctl, sys_msgctl)
1202
1203 -#define __NR_fcntl 72
1204 +#define __NR_fcntl __NR_COMMON_SYSCALL(72)
1205 __SYSCALL(__NR_fcntl, sys_fcntl)
1206 -#define __NR_flock 73
1207 +#define __NR_flock __NR_COMMON_SYSCALL(73)
1208 __SYSCALL(__NR_flock, sys_flock)
1209 -#define __NR_fsync 74
1210 +#define __NR_fsync __NR_COMMON_SYSCALL(74)
1211 __SYSCALL(__NR_fsync, sys_fsync)
1212 -#define __NR_fdatasync 75
1213 +#define __NR_fdatasync __NR_COMMON_SYSCALL(75)
1214 __SYSCALL(__NR_fdatasync, sys_fdatasync)
1215 -#define __NR_truncate 76
1216 +#define __NR_truncate __NR_COMMON_SYSCALL(76)
1217 __SYSCALL(__NR_truncate, sys_truncate)
1218 -#define __NR_ftruncate 77
1219 +#define __NR_ftruncate __NR_COMMON_SYSCALL(77)
1220 __SYSCALL(__NR_ftruncate, sys_ftruncate)
1221 -#define __NR_getdents 78
1222 -__SYSCALL(__NR_getdents, sys_getdents)
1223 -#define __NR_getcwd 79
1224 +#define __NR_64_getdents 78
1225 +__SYSCALL(__NR_64_getdents, sys_getdents)
1226 +#define __NR_getcwd __NR_COMMON_SYSCALL(79)
1227 __SYSCALL(__NR_getcwd, sys_getcwd)
1228
1229 -#define __NR_chdir 80
1230 +#define __NR_chdir __NR_COMMON_SYSCALL(80)
1231 __SYSCALL(__NR_chdir, sys_chdir)
1232 -#define __NR_fchdir 81
1233 +#define __NR_fchdir __NR_COMMON_SYSCALL(81)
1234 __SYSCALL(__NR_fchdir, sys_fchdir)
1235 -#define __NR_rename 82
1236 +#define __NR_rename __NR_COMMON_SYSCALL(82)
1237 __SYSCALL(__NR_rename, sys_rename)
1238 -#define __NR_mkdir 83
1239 +#define __NR_mkdir __NR_COMMON_SYSCALL(83)
1240 __SYSCALL(__NR_mkdir, sys_mkdir)
1241 -#define __NR_rmdir 84
1242 +#define __NR_rmdir __NR_COMMON_SYSCALL(84)
1243 __SYSCALL(__NR_rmdir, sys_rmdir)
1244 -#define __NR_creat 85
1245 +#define __NR_creat __NR_COMMON_SYSCALL(85)
1246 __SYSCALL(__NR_creat, sys_creat)
1247 -#define __NR_link 86
1248 +#define __NR_link __NR_COMMON_SYSCALL(86)
1249 __SYSCALL(__NR_link, sys_link)
1250 -#define __NR_unlink 87
1251 +#define __NR_unlink __NR_COMMON_SYSCALL(87)
1252 __SYSCALL(__NR_unlink, sys_unlink)
1253
1254 -#define __NR_symlink 88
1255 +#define __NR_symlink __NR_COMMON_SYSCALL(88)
1256 __SYSCALL(__NR_symlink, sys_symlink)
1257 -#define __NR_readlink 89
1258 +#define __NR_readlink __NR_COMMON_SYSCALL(89)
1259 __SYSCALL(__NR_readlink, sys_readlink)
1260 -#define __NR_chmod 90
1261 +#define __NR_chmod __NR_COMMON_SYSCALL(90)
1262 __SYSCALL(__NR_chmod, sys_chmod)
1263 -#define __NR_fchmod 91
1264 +#define __NR_fchmod __NR_COMMON_SYSCALL(91)
1265 __SYSCALL(__NR_fchmod, sys_fchmod)
1266 -#define __NR_chown 92
1267 +#define __NR_chown __NR_COMMON_SYSCALL(92)
1268 __SYSCALL(__NR_chown, sys_chown)
1269 -#define __NR_fchown 93
1270 +#define __NR_fchown __NR_COMMON_SYSCALL(93)
1271 __SYSCALL(__NR_fchown, sys_fchown)
1272 -#define __NR_lchown 94
1273 +#define __NR_lchown __NR_COMMON_SYSCALL(94)
1274 __SYSCALL(__NR_lchown, sys_lchown)
1275 -#define __NR_umask 95
1276 +#define __NR_umask __NR_COMMON_SYSCALL(95)
1277 __SYSCALL(__NR_umask, sys_umask)
1278
1279 -#define __NR_gettimeofday 96
1280 +#define __NR_gettimeofday __NR_COMMON_SYSCALL(96)
1281 __SYSCALL(__NR_gettimeofday, sys_gettimeofday)
1282 -#define __NR_getrlimit 97
1283 +#define __NR_getrlimit __NR_COMMON_SYSCALL(97)
1284 __SYSCALL(__NR_getrlimit, sys_getrlimit)
1285 -#define __NR_getrusage 98
1286 +#define __NR_getrusage __NR_COMMON_SYSCALL(98)
1287 __SYSCALL(__NR_getrusage, sys_getrusage)
1288 -#define __NR_sysinfo 99
1289 +#define __NR_sysinfo __NR_COMMON_SYSCALL(99)
1290 __SYSCALL(__NR_sysinfo, sys_sysinfo)
1291 -#define __NR_times 100
1292 -__SYSCALL(__NR_times, sys_times)
1293 -#define __NR_ptrace 101
1294 +#define __NR_64_times 100
1295 +__SYSCALL(__NR_64_times, sys_times)
1296 +#define __NR_ptrace __NR_COMMON_SYSCALL(101)
1297 __SYSCALL(__NR_ptrace, sys_ptrace)
1298 -#define __NR_getuid 102
1299 +#define __NR_getuid __NR_COMMON_SYSCALL(102)
1300 __SYSCALL(__NR_getuid, sys_getuid)
1301 -#define __NR_syslog 103
1302 +#define __NR_syslog __NR_COMMON_SYSCALL(103)
1303 __SYSCALL(__NR_syslog, sys_syslog)
1304
1305 /* at the very end the stuff that never runs during the benchmarks */
1306 -#define __NR_getgid 104
1307 +#define __NR_getgid __NR_COMMON_SYSCALL(104)
1308 __SYSCALL(__NR_getgid, sys_getgid)
1309 -#define __NR_setuid 105
1310 +#define __NR_setuid __NR_COMMON_SYSCALL(105)
1311 __SYSCALL(__NR_setuid, sys_setuid)
1312 -#define __NR_setgid 106
1313 +#define __NR_setgid __NR_COMMON_SYSCALL(106)
1314 __SYSCALL(__NR_setgid, sys_setgid)
1315 -#define __NR_geteuid 107
1316 +#define __NR_geteuid __NR_COMMON_SYSCALL(107)
1317 __SYSCALL(__NR_geteuid, sys_geteuid)
1318 -#define __NR_getegid 108
1319 +#define __NR_getegid __NR_COMMON_SYSCALL(108)
1320 __SYSCALL(__NR_getegid, sys_getegid)
1321 -#define __NR_setpgid 109
1322 +#define __NR_setpgid __NR_COMMON_SYSCALL(109)
1323 __SYSCALL(__NR_setpgid, sys_setpgid)
1324 -#define __NR_getppid 110
1325 +#define __NR_getppid __NR_COMMON_SYSCALL(110)
1326 __SYSCALL(__NR_getppid, sys_getppid)
1327 -#define __NR_getpgrp 111
1328 +#define __NR_getpgrp __NR_COMMON_SYSCALL(111)
1329 __SYSCALL(__NR_getpgrp, sys_getpgrp)
1330
1331 -#define __NR_setsid 112
1332 +#define __NR_setsid __NR_COMMON_SYSCALL(112)
1333 __SYSCALL(__NR_setsid, sys_setsid)
1334 -#define __NR_setreuid 113
1335 +#define __NR_setreuid __NR_COMMON_SYSCALL(113)
1336 __SYSCALL(__NR_setreuid, sys_setreuid)
1337 -#define __NR_setregid 114
1338 +#define __NR_setregid __NR_COMMON_SYSCALL(114)
1339 __SYSCALL(__NR_setregid, sys_setregid)
1340 -#define __NR_getgroups 115
1341 +#define __NR_getgroups __NR_COMMON_SYSCALL(115)
1342 __SYSCALL(__NR_getgroups, sys_getgroups)
1343 -#define __NR_setgroups 116
1344 +#define __NR_setgroups __NR_COMMON_SYSCALL(116)
1345 __SYSCALL(__NR_setgroups, sys_setgroups)
1346 -#define __NR_setresuid 117
1347 +#define __NR_setresuid __NR_COMMON_SYSCALL(117)
1348 __SYSCALL(__NR_setresuid, sys_setresuid)
1349 -#define __NR_getresuid 118
1350 +#define __NR_getresuid __NR_COMMON_SYSCALL(118)
1351 __SYSCALL(__NR_getresuid, sys_getresuid)
1352 -#define __NR_setresgid 119
1353 +#define __NR_setresgid __NR_COMMON_SYSCALL(119)
1354 __SYSCALL(__NR_setresgid, sys_setresgid)
1355
1356 -#define __NR_getresgid 120
1357 +#define __NR_getresgid __NR_COMMON_SYSCALL(120)
1358 __SYSCALL(__NR_getresgid, sys_getresgid)
1359 -#define __NR_getpgid 121
1360 +#define __NR_getpgid __NR_COMMON_SYSCALL(121)
1361 __SYSCALL(__NR_getpgid, sys_getpgid)
1362 -#define __NR_setfsuid 122
1363 +#define __NR_setfsuid __NR_COMMON_SYSCALL(122)
1364 __SYSCALL(__NR_setfsuid, sys_setfsuid)
1365 -#define __NR_setfsgid 123
1366 +#define __NR_setfsgid __NR_COMMON_SYSCALL(123)
1367 __SYSCALL(__NR_setfsgid, sys_setfsgid)
1368 -#define __NR_getsid 124
1369 +#define __NR_getsid __NR_COMMON_SYSCALL(124)
1370 __SYSCALL(__NR_getsid, sys_getsid)
1371 -#define __NR_capget 125
1372 +#define __NR_capget __NR_COMMON_SYSCALL(125)
1373 __SYSCALL(__NR_capget, sys_capget)
1374 -#define __NR_capset 126
1375 +#define __NR_capset __NR_COMMON_SYSCALL(126)
1376 __SYSCALL(__NR_capset, sys_capset)
1377
1378 -#define __NR_rt_sigpending 127
1379 -__SYSCALL(__NR_rt_sigpending, sys_rt_sigpending)
1380 -#define __NR_rt_sigtimedwait 128
1381 -__SYSCALL(__NR_rt_sigtimedwait, sys_rt_sigtimedwait)
1382 -#define __NR_rt_sigqueueinfo 129
1383 -__SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo)
1384 -#define __NR_rt_sigsuspend 130
1385 +#define __NR_64_rt_sigpending 127
1386 +__SYSCALL(__NR_64_rt_sigpending, sys_rt_sigpending)
1387 +#define __NR_64_rt_sigtimedwait 128
1388 +__SYSCALL(__NR_64_rt_sigtimedwait, sys_rt_sigtimedwait)
1389 +#define __NR_64_rt_sigqueueinfo 129
1390 +__SYSCALL(__NR_64_rt_sigqueueinfo, sys_rt_sigqueueinfo)
1391 +#define __NR_rt_sigsuspend __NR_COMMON_SYSCALL(130)
1392 __SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend)
1393 -#define __NR_sigaltstack 131
1394 -__SYSCALL(__NR_sigaltstack, stub_sigaltstack)
1395 -#define __NR_utime 132
1396 +#define __NR_64_sigaltstack 131
1397 +__SYSCALL(__NR_64_sigaltstack, stub_sigaltstack)
1398 +#define __NR_utime __NR_COMMON_SYSCALL(132)
1399 __SYSCALL(__NR_utime, sys_utime)
1400 -#define __NR_mknod 133
1401 +#define __NR_mknod __NR_COMMON_SYSCALL(133)
1402 __SYSCALL(__NR_mknod, sys_mknod)
1403
1404 /* Only needed for a.out */
1405 -#define __NR_uselib 134
1406 -__SYSCALL(__NR_uselib, sys_ni_syscall)
1407 -#define __NR_personality 135
1408 +#define __NR_64_uselib 134
1409 +__SYSCALL(__NR_64_uselib, sys_ni_syscall)
1410 +#define __NR_personality __NR_COMMON_SYSCALL(135)
1411 __SYSCALL(__NR_personality, sys_personality)
1412
1413 -#define __NR_ustat 136
1414 +#define __NR_ustat __NR_COMMON_SYSCALL(136)
1415 __SYSCALL(__NR_ustat, sys_ustat)
1416 -#define __NR_statfs 137
1417 +#define __NR_statfs __NR_COMMON_SYSCALL(137)
1418 __SYSCALL(__NR_statfs, sys_statfs)
1419 -#define __NR_fstatfs 138
1420 +#define __NR_fstatfs __NR_COMMON_SYSCALL(138)
1421 __SYSCALL(__NR_fstatfs, sys_fstatfs)
1422 -#define __NR_sysfs 139
1423 +#define __NR_sysfs __NR_COMMON_SYSCALL(139)
1424 __SYSCALL(__NR_sysfs, sys_sysfs)
1425
1426 -#define __NR_getpriority 140
1427 +#define __NR_getpriority __NR_COMMON_SYSCALL(140)
1428 __SYSCALL(__NR_getpriority, sys_getpriority)
1429 -#define __NR_setpriority 141
1430 +#define __NR_setpriority __NR_COMMON_SYSCALL(141)
1431 __SYSCALL(__NR_setpriority, sys_setpriority)
1432 -#define __NR_sched_setparam 142
1433 +#define __NR_sched_setparam __NR_COMMON_SYSCALL(142)
1434 __SYSCALL(__NR_sched_setparam, sys_sched_setparam)
1435 -#define __NR_sched_getparam 143
1436 +#define __NR_sched_getparam __NR_COMMON_SYSCALL(143)
1437 __SYSCALL(__NR_sched_getparam, sys_sched_getparam)
1438 -#define __NR_sched_setscheduler 144
1439 +#define __NR_sched_setscheduler __NR_COMMON_SYSCALL(144)
1440 __SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)
1441 -#define __NR_sched_getscheduler 145
1442 +#define __NR_sched_getscheduler __NR_COMMON_SYSCALL(145)
1443 __SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
1444 -#define __NR_sched_get_priority_max 146
1445 +#define __NR_sched_get_priority_max __NR_COMMON_SYSCALL(146)
1446 __SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
1447 -#define __NR_sched_get_priority_min 147
1448 +#define __NR_sched_get_priority_min __NR_COMMON_SYSCALL(147)
1449 __SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
1450 -#define __NR_sched_rr_get_interval 148
1451 +#define __NR_sched_rr_get_interval __NR_COMMON_SYSCALL(148)
1452 __SYSCALL(__NR_sched_rr_get_interval, sys_sched_rr_get_interval)
1453
1454 -#define __NR_mlock 149
1455 +#define __NR_mlock __NR_COMMON_SYSCALL(149)
1456 __SYSCALL(__NR_mlock, sys_mlock)
1457 -#define __NR_munlock 150
1458 +#define __NR_munlock __NR_COMMON_SYSCALL(150)
1459 __SYSCALL(__NR_munlock, sys_munlock)
1460 -#define __NR_mlockall 151
1461 +#define __NR_mlockall __NR_COMMON_SYSCALL(151)
1462 __SYSCALL(__NR_mlockall, sys_mlockall)
1463 -#define __NR_munlockall 152
1464 +#define __NR_munlockall __NR_COMMON_SYSCALL(152)
1465 __SYSCALL(__NR_munlockall, sys_munlockall)
1466
1467 -#define __NR_vhangup 153
1468 +#define __NR_vhangup __NR_COMMON_SYSCALL(153)
1469 __SYSCALL(__NR_vhangup, sys_vhangup)
1470
1471 -#define __NR_modify_ldt 154
1472 +#define __NR_modify_ldt __NR_COMMON_SYSCALL(154)
1473 __SYSCALL(__NR_modify_ldt, sys_modify_ldt)
1474
1475 -#define __NR_pivot_root 155
1476 +#define __NR_pivot_root __NR_COMMON_SYSCALL(155)
1477 __SYSCALL(__NR_pivot_root, sys_pivot_root)
1478
1479 -#define __NR__sysctl 156
1480 -__SYSCALL(__NR__sysctl, sys_sysctl)
1481 +#define __NR_64__sysctl 156
1482 +__SYSCALL(__NR_64__sysctl, sys_sysctl)
1483
1484 -#define __NR_prctl 157
1485 +#define __NR_prctl __NR_COMMON_SYSCALL(157)
1486 __SYSCALL(__NR_prctl, sys_prctl)
1487 -#define __NR_arch_prctl 158
1488 +#define __NR_arch_prctl __NR_COMMON_SYSCALL(158)
1489 __SYSCALL(__NR_arch_prctl, sys_arch_prctl)
1490
1491 -#define __NR_adjtimex 159
1492 +#define __NR_adjtimex __NR_COMMON_SYSCALL(159)
1493 __SYSCALL(__NR_adjtimex, sys_adjtimex)
1494
1495 -#define __NR_setrlimit 160
1496 +#define __NR_setrlimit __NR_COMMON_SYSCALL(160)
1497 __SYSCALL(__NR_setrlimit, sys_setrlimit)
1498
1499 -#define __NR_chroot 161
1500 +#define __NR_chroot __NR_COMMON_SYSCALL(161)
1501 __SYSCALL(__NR_chroot, sys_chroot)
1502
1503 -#define __NR_sync 162
1504 +#define __NR_sync __NR_COMMON_SYSCALL(162)
1505 __SYSCALL(__NR_sync, sys_sync)
1506
1507 -#define __NR_acct 163
1508 +#define __NR_acct __NR_COMMON_SYSCALL(163)
1509 __SYSCALL(__NR_acct, sys_acct)
1510
1511 -#define __NR_settimeofday 164
1512 +#define __NR_settimeofday __NR_COMMON_SYSCALL(164)
1513 __SYSCALL(__NR_settimeofday, sys_settimeofday)
1514
1515 -#define __NR_mount 165
1516 +#define __NR_mount __NR_COMMON_SYSCALL(165)
1517 __SYSCALL(__NR_mount, sys_mount)
1518 -#define __NR_umount2 166
1519 +#define __NR_umount2 __NR_COMMON_SYSCALL(166)
1520 __SYSCALL(__NR_umount2, sys_umount)
1521
1522 -#define __NR_swapon 167
1523 +#define __NR_swapon __NR_COMMON_SYSCALL(167)
1524 __SYSCALL(__NR_swapon, sys_swapon)
1525 -#define __NR_swapoff 168
1526 +#define __NR_swapoff __NR_COMMON_SYSCALL(168)
1527 __SYSCALL(__NR_swapoff, sys_swapoff)
1528
1529 -#define __NR_reboot 169
1530 +#define __NR_reboot __NR_COMMON_SYSCALL(169)
1531 __SYSCALL(__NR_reboot, sys_reboot)
1532
1533 -#define __NR_sethostname 170
1534 +#define __NR_sethostname __NR_COMMON_SYSCALL(170)
1535 __SYSCALL(__NR_sethostname, sys_sethostname)
1536 -#define __NR_setdomainname 171
1537 +#define __NR_setdomainname __NR_COMMON_SYSCALL(171)
1538 __SYSCALL(__NR_setdomainname, sys_setdomainname)
1539
1540 -#define __NR_iopl 172
1541 +#define __NR_iopl __NR_COMMON_SYSCALL(172)
1542 __SYSCALL(__NR_iopl, stub_iopl)
1543 -#define __NR_ioperm 173
1544 +#define __NR_ioperm __NR_COMMON_SYSCALL(173)
1545 __SYSCALL(__NR_ioperm, sys_ioperm)
1546
1547 -#define __NR_create_module 174
1548 -__SYSCALL(__NR_create_module, sys_ni_syscall)
1549 -#define __NR_init_module 175
1550 +#define __NR_64_create_module 174
1551 +__SYSCALL(__NR_64_create_module, sys_ni_syscall)
1552 +#define __NR_init_module __NR_COMMON_SYSCALL(175)
1553 __SYSCALL(__NR_init_module, sys_init_module)
1554 -#define __NR_delete_module 176
1555 +#define __NR_delete_module __NR_COMMON_SYSCALL(176)
1556 __SYSCALL(__NR_delete_module, sys_delete_module)
1557 -#define __NR_get_kernel_syms 177
1558 -__SYSCALL(__NR_get_kernel_syms, sys_ni_syscall)
1559 -#define __NR_query_module 178
1560 -__SYSCALL(__NR_query_module, sys_ni_syscall)
1561 +#define __NR_64_get_kernel_syms 177
1562 +__SYSCALL(__NR_64_get_kernel_syms, sys_ni_syscall)
1563 +#define __NR_64_query_module 178
1564 +__SYSCALL(__NR_64_query_module, sys_ni_syscall)
1565
1566 -#define __NR_quotactl 179
1567 +#define __NR_quotactl __NR_COMMON_SYSCALL(179)
1568 __SYSCALL(__NR_quotactl, sys_quotactl)
1569
1570 -#define __NR_nfsservctl 180
1571 -__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
1572 +#define __NR_64_nfsservctl 180
1573 +__SYSCALL(__NR_64_nfsservctl, sys_ni_syscall)
1574
1575 /* reserved for LiS/STREAMS */
1576 -#define __NR_getpmsg 181
1577 +#define __NR_getpmsg __NR_COMMON_SYSCALL(181)
1578 __SYSCALL(__NR_getpmsg, sys_ni_syscall)
1579 -#define __NR_putpmsg 182
1580 +#define __NR_putpmsg __NR_COMMON_SYSCALL(182)
1581 __SYSCALL(__NR_putpmsg, sys_ni_syscall)
1582
1583 /* reserved for AFS */
1584 -#define __NR_afs_syscall 183
1585 +#define __NR_afs_syscall __NR_COMMON_SYSCALL(183)
1586 __SYSCALL(__NR_afs_syscall, sys_ni_syscall)
1587
1588 /* reserved for tux */
1589 -#define __NR_tuxcall 184
1590 +#define __NR_tuxcall __NR_COMMON_SYSCALL(184)
1591 __SYSCALL(__NR_tuxcall, sys_ni_syscall)
1592
1593 -#define __NR_security 185
1594 +#define __NR_security __NR_COMMON_SYSCALL(185)
1595 __SYSCALL(__NR_security, sys_ni_syscall)
1596
1597 -#define __NR_gettid 186
1598 +#define __NR_gettid __NR_COMMON_SYSCALL(186)
1599 __SYSCALL(__NR_gettid, sys_gettid)
1600
1601 -#define __NR_readahead 187
1602 +#define __NR_readahead __NR_COMMON_SYSCALL(187)
1603 __SYSCALL(__NR_readahead, sys_readahead)
1604 -#define __NR_setxattr 188
1605 +#define __NR_setxattr __NR_COMMON_SYSCALL(188)
1606 __SYSCALL(__NR_setxattr, sys_setxattr)
1607 -#define __NR_lsetxattr 189
1608 +#define __NR_lsetxattr __NR_COMMON_SYSCALL(189)
1609 __SYSCALL(__NR_lsetxattr, sys_lsetxattr)
1610 -#define __NR_fsetxattr 190
1611 +#define __NR_fsetxattr __NR_COMMON_SYSCALL(190)
1612 __SYSCALL(__NR_fsetxattr, sys_fsetxattr)
1613 -#define __NR_getxattr 191
1614 +#define __NR_getxattr __NR_COMMON_SYSCALL(191)
1615 __SYSCALL(__NR_getxattr, sys_getxattr)
1616 -#define __NR_lgetxattr 192
1617 +#define __NR_lgetxattr __NR_COMMON_SYSCALL(192)
1618 __SYSCALL(__NR_lgetxattr, sys_lgetxattr)
1619 -#define __NR_fgetxattr 193
1620 +#define __NR_fgetxattr __NR_COMMON_SYSCALL(193)
1621 __SYSCALL(__NR_fgetxattr, sys_fgetxattr)
1622 -#define __NR_listxattr 194
1623 +#define __NR_listxattr __NR_COMMON_SYSCALL(194)
1624 __SYSCALL(__NR_listxattr, sys_listxattr)
1625 -#define __NR_llistxattr 195
1626 +#define __NR_llistxattr __NR_COMMON_SYSCALL(195)
1627 __SYSCALL(__NR_llistxattr, sys_llistxattr)
1628 -#define __NR_flistxattr 196
1629 +#define __NR_flistxattr __NR_COMMON_SYSCALL(196)
1630 __SYSCALL(__NR_flistxattr, sys_flistxattr)
1631 -#define __NR_removexattr 197
1632 +#define __NR_removexattr __NR_COMMON_SYSCALL(197)
1633 __SYSCALL(__NR_removexattr, sys_removexattr)
1634 -#define __NR_lremovexattr 198
1635 +#define __NR_lremovexattr __NR_COMMON_SYSCALL(198)
1636 __SYSCALL(__NR_lremovexattr, sys_lremovexattr)
1637 -#define __NR_fremovexattr 199
1638 +#define __NR_fremovexattr __NR_COMMON_SYSCALL(199)
1639 __SYSCALL(__NR_fremovexattr, sys_fremovexattr)
1640 -#define __NR_tkill 200
1641 +#define __NR_tkill __NR_COMMON_SYSCALL(200)
1642 __SYSCALL(__NR_tkill, sys_tkill)
1643 -#define __NR_time 201
1644 +#define __NR_time __NR_COMMON_SYSCALL(201)
1645 __SYSCALL(__NR_time, sys_time)
1646 -#define __NR_futex 202
1647 +#define __NR_futex __NR_COMMON_SYSCALL(202)
1648 __SYSCALL(__NR_futex, sys_futex)
1649 -#define __NR_sched_setaffinity 203
1650 +#define __NR_sched_setaffinity __NR_COMMON_SYSCALL(203)
1651 __SYSCALL(__NR_sched_setaffinity, sys_sched_setaffinity)
1652 -#define __NR_sched_getaffinity 204
1653 +#define __NR_sched_getaffinity __NR_COMMON_SYSCALL(204)
1654 __SYSCALL(__NR_sched_getaffinity, sys_sched_getaffinity)
1655 -#define __NR_set_thread_area 205
1656 -__SYSCALL(__NR_set_thread_area, sys_ni_syscall) /* use arch_prctl */
1657 -#define __NR_io_setup 206
1658 +#define __NR_64_set_thread_area 205
1659 +__SYSCALL(__NR_64_set_thread_area, sys_ni_syscall) /* use arch_prctl */
1660 +#define __NR_io_setup __NR_COMMON_SYSCALL(206)
1661 __SYSCALL(__NR_io_setup, sys_io_setup)
1662 -#define __NR_io_destroy 207
1663 +#define __NR_io_destroy __NR_COMMON_SYSCALL(207)
1664 __SYSCALL(__NR_io_destroy, sys_io_destroy)
1665 -#define __NR_io_getevents 208
1666 +#define __NR_io_getevents __NR_COMMON_SYSCALL(208)
1667 __SYSCALL(__NR_io_getevents, sys_io_getevents)
1668 -#define __NR_io_submit 209
1669 +#define __NR_io_submit __NR_COMMON_SYSCALL(209)
1670 __SYSCALL(__NR_io_submit, sys_io_submit)
1671 -#define __NR_io_cancel 210
1672 +#define __NR_io_cancel __NR_COMMON_SYSCALL(210)
1673 __SYSCALL(__NR_io_cancel, sys_io_cancel)
1674 -#define __NR_get_thread_area 211
1675 -__SYSCALL(__NR_get_thread_area, sys_ni_syscall) /* use arch_prctl */
1676 -#define __NR_lookup_dcookie 212
1677 +#define __NR_64_get_thread_area 211
1678 +__SYSCALL(__NR_64_get_thread_area, sys_ni_syscall) /* use arch_prctl */
1679 +#define __NR_lookup_dcookie __NR_COMMON_SYSCALL(212)
1680 __SYSCALL(__NR_lookup_dcookie, sys_lookup_dcookie)
1681 -#define __NR_epoll_create 213
1682 +#define __NR_epoll_create __NR_COMMON_SYSCALL(213)
1683 __SYSCALL(__NR_epoll_create, sys_epoll_create)
1684 -#define __NR_epoll_ctl_old 214
1685 -__SYSCALL(__NR_epoll_ctl_old, sys_ni_syscall)
1686 -#define __NR_epoll_wait_old 215
1687 -__SYSCALL(__NR_epoll_wait_old, sys_ni_syscall)
1688 -#define __NR_remap_file_pages 216
1689 +#define __NR_64_epoll_ctl_old 214
1690 +__SYSCALL(__NR_64_epoll_ctl_old, sys_ni_syscall)
1691 +#define __NR_64_epoll_wait_old 215
1692 +__SYSCALL(__NR_64_epoll_wait_old, sys_ni_syscall)
1693 +#define __NR_remap_file_pages __NR_COMMON_SYSCALL(216)
1694 __SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
1695 -#define __NR_getdents64 217
1696 +#define __NR_getdents64 __NR_COMMON_SYSCALL(217)
1697 __SYSCALL(__NR_getdents64, sys_getdents64)
1698 -#define __NR_set_tid_address 218
1699 +#define __NR_set_tid_address __NR_COMMON_SYSCALL(218)
1700 __SYSCALL(__NR_set_tid_address, sys_set_tid_address)
1701 -#define __NR_restart_syscall 219
1702 +#define __NR_restart_syscall __NR_COMMON_SYSCALL(219)
1703 __SYSCALL(__NR_restart_syscall, sys_restart_syscall)
1704 -#define __NR_semtimedop 220
1705 +#define __NR_semtimedop __NR_COMMON_SYSCALL(220)
1706 __SYSCALL(__NR_semtimedop, sys_semtimedop)
1707 -#define __NR_fadvise64 221
1708 +#define __NR_fadvise64 __NR_COMMON_SYSCALL(221)
1709 __SYSCALL(__NR_fadvise64, sys_fadvise64)
1710 -#define __NR_timer_create 222
1711 -__SYSCALL(__NR_timer_create, sys_timer_create)
1712 -#define __NR_timer_settime 223
1713 +#define __NR_64_timer_create 222
1714 +__SYSCALL(__NR_64_timer_create, sys_timer_create)
1715 +#define __NR_timer_settime __NR_COMMON_SYSCALL(223)
1716 __SYSCALL(__NR_timer_settime, sys_timer_settime)
1717 -#define __NR_timer_gettime 224
1718 +#define __NR_timer_gettime __NR_COMMON_SYSCALL(224)
1719 __SYSCALL(__NR_timer_gettime, sys_timer_gettime)
1720 -#define __NR_timer_getoverrun 225
1721 +#define __NR_timer_getoverrun __NR_COMMON_SYSCALL(225)
1722 __SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
1723 -#define __NR_timer_delete 226
1724 +#define __NR_timer_delete __NR_COMMON_SYSCALL(226)
1725 __SYSCALL(__NR_timer_delete, sys_timer_delete)
1726 -#define __NR_clock_settime 227
1727 +#define __NR_clock_settime __NR_COMMON_SYSCALL(227)
1728 __SYSCALL(__NR_clock_settime, sys_clock_settime)
1729 -#define __NR_clock_gettime 228
1730 +#define __NR_clock_gettime __NR_COMMON_SYSCALL(228)
1731 __SYSCALL(__NR_clock_gettime, sys_clock_gettime)
1732 -#define __NR_clock_getres 229
1733 +#define __NR_clock_getres __NR_COMMON_SYSCALL(229)
1734 __SYSCALL(__NR_clock_getres, sys_clock_getres)
1735 -#define __NR_clock_nanosleep 230
1736 +#define __NR_clock_nanosleep __NR_COMMON_SYSCALL(230)
1737 __SYSCALL(__NR_clock_nanosleep, sys_clock_nanosleep)
1738 -#define __NR_exit_group 231
1739 +#define __NR_exit_group __NR_COMMON_SYSCALL(231)
1740 __SYSCALL(__NR_exit_group, sys_exit_group)
1741 -#define __NR_epoll_wait 232
1742 +#define __NR_epoll_wait __NR_COMMON_SYSCALL(232)
1743 __SYSCALL(__NR_epoll_wait, sys_epoll_wait)
1744 -#define __NR_epoll_ctl 233
1745 +#define __NR_epoll_ctl __NR_COMMON_SYSCALL(233)
1746 __SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)
1747 -#define __NR_tgkill 234
1748 +#define __NR_tgkill __NR_COMMON_SYSCALL(234)
1749 __SYSCALL(__NR_tgkill, sys_tgkill)
1750 -#define __NR_utimes 235
1751 +#define __NR_utimes __NR_COMMON_SYSCALL(235)
1752 __SYSCALL(__NR_utimes, sys_utimes)
1753 -#define __NR_vserver 236
1754 -__SYSCALL(__NR_vserver, sys_ni_syscall)
1755 -#define __NR_mbind 237
1756 +#define __NR_64_vserver 236
1757 +__SYSCALL(__NR_64_vserver, sys_ni_syscall)
1758 +#define __NR_mbind __NR_COMMON_SYSCALL(237)
1759 __SYSCALL(__NR_mbind, sys_mbind)
1760 -#define __NR_set_mempolicy 238
1761 +#define __NR_set_mempolicy __NR_COMMON_SYSCALL(238)
1762 __SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)
1763 -#define __NR_get_mempolicy 239
1764 +#define __NR_get_mempolicy __NR_COMMON_SYSCALL(239)
1765 __SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)
1766 -#define __NR_mq_open 240
1767 +#define __NR_mq_open __NR_COMMON_SYSCALL(240)
1768 __SYSCALL(__NR_mq_open, sys_mq_open)
1769 -#define __NR_mq_unlink 241
1770 +#define __NR_mq_unlink __NR_COMMON_SYSCALL(241)
1771 __SYSCALL(__NR_mq_unlink, sys_mq_unlink)
1772 -#define __NR_mq_timedsend 242
1773 +#define __NR_mq_timedsend __NR_COMMON_SYSCALL(242)
1774 __SYSCALL(__NR_mq_timedsend, sys_mq_timedsend)
1775 -#define __NR_mq_timedreceive 243
1776 +#define __NR_mq_timedreceive __NR_COMMON_SYSCALL(243)
1777 __SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive)
1778 -#define __NR_mq_notify 244
1779 -__SYSCALL(__NR_mq_notify, sys_mq_notify)
1780 -#define __NR_mq_getsetattr 245
1781 +#define __NR_64_mq_notify 244
1782 +__SYSCALL(__NR_64_mq_notify, sys_mq_notify)
1783 +#define __NR_mq_getsetattr __NR_COMMON_SYSCALL(245)
1784 __SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr)
1785 -#define __NR_kexec_load 246
1786 -__SYSCALL(__NR_kexec_load, sys_kexec_load)
1787 -#define __NR_waitid 247
1788 -__SYSCALL(__NR_waitid, sys_waitid)
1789 -#define __NR_add_key 248
1790 +#define __NR_64_kexec_load 246
1791 +__SYSCALL(__NR_64_kexec_load, sys_kexec_load)
1792 +#define __NR_64_waitid 247
1793 +__SYSCALL(__NR_64_waitid, sys_waitid)
1794 +#define __NR_add_key __NR_COMMON_SYSCALL(248)
1795 __SYSCALL(__NR_add_key, sys_add_key)
1796 -#define __NR_request_key 249
1797 +#define __NR_request_key __NR_COMMON_SYSCALL(249)
1798 __SYSCALL(__NR_request_key, sys_request_key)
1799 -#define __NR_keyctl 250
1800 +#define __NR_keyctl __NR_COMMON_SYSCALL(250)
1801 __SYSCALL(__NR_keyctl, sys_keyctl)
1802 -#define __NR_ioprio_set 251
1803 +#define __NR_ioprio_set __NR_COMMON_SYSCALL(251)
1804 __SYSCALL(__NR_ioprio_set, sys_ioprio_set)
1805 -#define __NR_ioprio_get 252
1806 +#define __NR_ioprio_get __NR_COMMON_SYSCALL(252)
1807 __SYSCALL(__NR_ioprio_get, sys_ioprio_get)
1808 -#define __NR_inotify_init 253
1809 +#define __NR_inotify_init __NR_COMMON_SYSCALL(253)
1810 __SYSCALL(__NR_inotify_init, sys_inotify_init)
1811 -#define __NR_inotify_add_watch 254
1812 +#define __NR_inotify_add_watch __NR_COMMON_SYSCALL(254)
1813 __SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
1814 -#define __NR_inotify_rm_watch 255
1815 +#define __NR_inotify_rm_watch __NR_COMMON_SYSCALL(255)
1816 __SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
1817 -#define __NR_migrate_pages 256
1818 +#define __NR_migrate_pages __NR_COMMON_SYSCALL(256)
1819 __SYSCALL(__NR_migrate_pages, sys_migrate_pages)
1820 -#define __NR_openat 257
1821 +#define __NR_openat __NR_COMMON_SYSCALL(257)
1822 __SYSCALL(__NR_openat, sys_openat)
1823 -#define __NR_mkdirat 258
1824 +#define __NR_mkdirat __NR_COMMON_SYSCALL(258)
1825 __SYSCALL(__NR_mkdirat, sys_mkdirat)
1826 -#define __NR_mknodat 259
1827 +#define __NR_mknodat __NR_COMMON_SYSCALL(259)
1828 __SYSCALL(__NR_mknodat, sys_mknodat)
1829 -#define __NR_fchownat 260
1830 +#define __NR_fchownat __NR_COMMON_SYSCALL(260)
1831 __SYSCALL(__NR_fchownat, sys_fchownat)
1832 -#define __NR_futimesat 261
1833 +#define __NR_futimesat __NR_COMMON_SYSCALL(261)
1834 __SYSCALL(__NR_futimesat, sys_futimesat)
1835 -#define __NR_newfstatat 262
1836 +#define __NR_newfstatat __NR_COMMON_SYSCALL(262)
1837 __SYSCALL(__NR_newfstatat, sys_newfstatat)
1838 -#define __NR_unlinkat 263
1839 +#define __NR_unlinkat __NR_COMMON_SYSCALL(263)
1840 __SYSCALL(__NR_unlinkat, sys_unlinkat)
1841 -#define __NR_renameat 264
1842 +#define __NR_renameat __NR_COMMON_SYSCALL(264)
1843 __SYSCALL(__NR_renameat, sys_renameat)
1844 -#define __NR_linkat 265
1845 +#define __NR_linkat __NR_COMMON_SYSCALL(265)
1846 __SYSCALL(__NR_linkat, sys_linkat)
1847 -#define __NR_symlinkat 266
1848 +#define __NR_symlinkat __NR_COMMON_SYSCALL(266)
1849 __SYSCALL(__NR_symlinkat, sys_symlinkat)
1850 -#define __NR_readlinkat 267
1851 +#define __NR_readlinkat __NR_COMMON_SYSCALL(267)
1852 __SYSCALL(__NR_readlinkat, sys_readlinkat)
1853 -#define __NR_fchmodat 268
1854 +#define __NR_fchmodat __NR_COMMON_SYSCALL(268)
1855 __SYSCALL(__NR_fchmodat, sys_fchmodat)
1856 -#define __NR_faccessat 269
1857 +#define __NR_faccessat __NR_COMMON_SYSCALL(269)
1858 __SYSCALL(__NR_faccessat, sys_faccessat)
1859 -#define __NR_pselect6 270
1860 +#define __NR_pselect6 __NR_COMMON_SYSCALL(270)
1861 __SYSCALL(__NR_pselect6, sys_pselect6)
1862 -#define __NR_ppoll 271
1863 -__SYSCALL(__NR_ppoll, sys_ppoll)
1864 -#define __NR_unshare 272
1865 +#define __NR_ppoll __NR_COMMON_SYSCALL(271)
1866 +__SYSCALL(__NR_ppoll, sys_ppoll)
1867 +#define __NR_unshare __NR_COMMON_SYSCALL(272)
1868 __SYSCALL(__NR_unshare, sys_unshare)
1869 -#define __NR_set_robust_list 273
1870 -__SYSCALL(__NR_set_robust_list, sys_set_robust_list)
1871 -#define __NR_get_robust_list 274
1872 -__SYSCALL(__NR_get_robust_list, sys_get_robust_list)
1873 -#define __NR_splice 275
1874 +#define __NR_64_set_robust_list 273
1875 +__SYSCALL(__NR_64_set_robust_list, sys_set_robust_list)
1876 +#define __NR_64_get_robust_list 274
1877 +__SYSCALL(__NR_64_get_robust_list, sys_get_robust_list)
1878 +#define __NR_splice __NR_COMMON_SYSCALL(275)
1879 __SYSCALL(__NR_splice, sys_splice)
1880 -#define __NR_tee 276
1881 +#define __NR_tee __NR_COMMON_SYSCALL(276)
1882 __SYSCALL(__NR_tee, sys_tee)
1883 -#define __NR_sync_file_range 277
1884 +#define __NR_sync_file_range __NR_COMMON_SYSCALL(277)
1885 __SYSCALL(__NR_sync_file_range, sys_sync_file_range)
1886 -#define __NR_vmsplice 278
1887 -__SYSCALL(__NR_vmsplice, sys_vmsplice)
1888 -#define __NR_move_pages 279
1889 -__SYSCALL(__NR_move_pages, sys_move_pages)
1890 -#define __NR_utimensat 280
1891 +#define __NR_64_vmsplice 278
1892 +__SYSCALL(__NR_64_vmsplice, sys_vmsplice)
1893 +#define __NR_64_move_pages 279
1894 +__SYSCALL(__NR_64_move_pages, sys_move_pages)
1895 +#define __NR_utimensat __NR_COMMON_SYSCALL(280)
1896 __SYSCALL(__NR_utimensat, sys_utimensat)
1897 -#define __NR_epoll_pwait 281
1898 +#define __NR_epoll_pwait __NR_COMMON_SYSCALL(281)
1899 __SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
1900 -#define __NR_signalfd 282
1901 +#define __NR_signalfd __NR_COMMON_SYSCALL(282)
1902 __SYSCALL(__NR_signalfd, sys_signalfd)
1903 -#define __NR_timerfd_create 283
1904 +#define __NR_timerfd_create __NR_COMMON_SYSCALL(283)
1905 __SYSCALL(__NR_timerfd_create, sys_timerfd_create)
1906 -#define __NR_eventfd 284
1907 +#define __NR_eventfd __NR_COMMON_SYSCALL(284)
1908 __SYSCALL(__NR_eventfd, sys_eventfd)
1909 -#define __NR_fallocate 285
1910 +#define __NR_fallocate __NR_COMMON_SYSCALL(285)
1911 __SYSCALL(__NR_fallocate, sys_fallocate)
1912 -#define __NR_timerfd_settime 286
1913 +#define __NR_timerfd_settime __NR_COMMON_SYSCALL(286)
1914 __SYSCALL(__NR_timerfd_settime, sys_timerfd_settime)
1915 -#define __NR_timerfd_gettime 287
1916 +#define __NR_timerfd_gettime __NR_COMMON_SYSCALL(287)
1917 __SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)
1918 -#define __NR_accept4 288
1919 +#define __NR_accept4 __NR_COMMON_SYSCALL(288)
1920 __SYSCALL(__NR_accept4, sys_accept4)
1921 -#define __NR_signalfd4 289
1922 +#define __NR_signalfd4 __NR_COMMON_SYSCALL(289)
1923 __SYSCALL(__NR_signalfd4, sys_signalfd4)
1924 -#define __NR_eventfd2 290
1925 +#define __NR_eventfd2 __NR_COMMON_SYSCALL(290)
1926 __SYSCALL(__NR_eventfd2, sys_eventfd2)
1927 -#define __NR_epoll_create1 291
1928 +#define __NR_epoll_create1 __NR_COMMON_SYSCALL(291)
1929 __SYSCALL(__NR_epoll_create1, sys_epoll_create1)
1930 -#define __NR_dup3 292
1931 +#define __NR_dup3 __NR_COMMON_SYSCALL(292)
1932 __SYSCALL(__NR_dup3, sys_dup3)
1933 -#define __NR_pipe2 293
1934 +#define __NR_pipe2 __NR_COMMON_SYSCALL(293)
1935 __SYSCALL(__NR_pipe2, sys_pipe2)
1936 -#define __NR_inotify_init1 294
1937 +#define __NR_inotify_init1 __NR_COMMON_SYSCALL(294)
1938 __SYSCALL(__NR_inotify_init1, sys_inotify_init1)
1939 -#define __NR_preadv 295
1940 -__SYSCALL(__NR_preadv, sys_preadv)
1941 -#define __NR_pwritev 296
1942 -__SYSCALL(__NR_pwritev, sys_pwritev)
1943 -#define __NR_rt_tgsigqueueinfo 297
1944 -__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
1945 -#define __NR_perf_event_open 298
1946 +#define __NR_64_preadv 295
1947 +__SYSCALL(__NR_64_preadv, sys_preadv)
1948 +#define __NR_64_pwritev 296
1949 +__SYSCALL(__NR_64_pwritev, sys_pwritev)
1950 +#define __NR_64_rt_tgsigqueueinfo 297
1951 +__SYSCALL(__NR_64_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
1952 +#define __NR_perf_event_open __NR_COMMON_SYSCALL(298)
1953 __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
1954 -#define __NR_recvmmsg 299
1955 -__SYSCALL(__NR_recvmmsg, sys_recvmmsg)
1956 -#define __NR_fanotify_init 300
1957 +#define __NR_64_recvmmsg 299
1958 +__SYSCALL(__NR_64_recvmmsg, sys_recvmmsg)
1959 +#define __NR_fanotify_init __NR_COMMON_SYSCALL(300)
1960 __SYSCALL(__NR_fanotify_init, sys_fanotify_init)
1961 -#define __NR_fanotify_mark 301
1962 +#define __NR_fanotify_mark __NR_COMMON_SYSCALL(301)
1963 __SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)
1964 -#define __NR_prlimit64 302
1965 +#define __NR_prlimit64 __NR_COMMON_SYSCALL(302)
1966 __SYSCALL(__NR_prlimit64, sys_prlimit64)
1967 -#define __NR_name_to_handle_at 303
1968 +#define __NR_name_to_handle_at __NR_COMMON_SYSCALL(303)
1969 __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
1970 -#define __NR_open_by_handle_at 304
1971 +#define __NR_open_by_handle_at __NR_COMMON_SYSCALL(304)
1972 __SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)
1973 -#define __NR_clock_adjtime 305
1974 +#define __NR_clock_adjtime __NR_COMMON_SYSCALL(305)
1975 __SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)
1976 -#define __NR_syncfs 306
1977 +#define __NR_syncfs __NR_COMMON_SYSCALL(306)
1978 __SYSCALL(__NR_syncfs, sys_syncfs)
1979 -#define __NR_sendmmsg 307
1980 -__SYSCALL(__NR_sendmmsg, sys_sendmmsg)
1981 -#define __NR_setns 308
1982 +#define __NR_64_sendmmsg 307
1983 +__SYSCALL(__NR_64_sendmmsg, sys_sendmmsg)
1984 +#define __NR_setns __NR_COMMON_SYSCALL(308)
1985 __SYSCALL(__NR_setns, sys_setns)
1986 -#define __NR_getcpu 309
1987 +#define __NR_getcpu __NR_COMMON_SYSCALL(309)
1988 __SYSCALL(__NR_getcpu, sys_getcpu)
1989 -#define __NR_process_vm_readv 310
1990 -__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv)
1991 -#define __NR_process_vm_writev 311
1992 -__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev)
1993 +#define __NR_64_process_vm_readv 310
1994 +__SYSCALL(__NR_64_process_vm_readv, sys_process_vm_readv)
1995 +#define __NR_64_process_vm_writev 311
1996 +__SYSCALL(__NR_64_process_vm_writev, sys_process_vm_writev)
1997 +
1998 +/* X32 support. */
1999 +#define __NR_x32_rt_sigaction __NR_X32_SYSCALL(0)
2000 +__X32_SYSCALL(__NR_x32_rt_sigaction, sys32_rt_sigaction)
2001 +#define __NR_x32_rt_sigprocmask __NR_X32_SYSCALL(1)
2002 +__X32_SYSCALL(__NR_x32_rt_sigprocmask, sys32_rt_sigprocmask)
2003 +#define __NR_x32_rt_sigreturn __NR_X32_SYSCALL(2)
2004 +__X32_SYSCALL(__NR_x32_rt_sigreturn, stub_x32_rt_sigreturn)
2005 +#define __NR_x32_ioctl __NR_X32_SYSCALL(3)
2006 +__X32_SYSCALL(__NR_x32_ioctl, compat_sys_ioctl)
2007 +#define __NR_x32_readv __NR_X32_SYSCALL(4)
2008 +__X32_SYSCALL(__NR_x32_readv, compat_sys_readv)
2009 +#define __NR_x32_writev __NR_X32_SYSCALL(5)
2010 +__X32_SYSCALL(__NR_x32_writev, compat_sys_writev)
2011 +#define __NR_x32_recvfrom __NR_X32_SYSCALL(6)
2012 +__X32_SYSCALL(__NR_x32_recvfrom, compat_sys_recvfrom)
2013 +#define __NR_x32_sendmsg __NR_X32_SYSCALL(7)
2014 +__X32_SYSCALL(__NR_x32_sendmsg, compat_sys_sendmsg)
2015 +
2016 +#define __NR_x32_recvmsg __NR_X32_SYSCALL(8)
2017 +__X32_SYSCALL(__NR_x32_recvmsg, compat_sys_recvmsg)
2018 +#define __NR_x32_execve __NR_X32_SYSCALL(9)
2019 +__X32_SYSCALL(__NR_x32_execve, stub_x32_execve)
2020 +#define __NR_x32_times __NR_X32_SYSCALL(10)
2021 +__X32_SYSCALL(__NR_x32_times, compat_sys_times)
2022 +#define __NR_x32_rt_sigpending __NR_X32_SYSCALL(11)
2023 +__X32_SYSCALL(__NR_x32_rt_sigpending, sys32_rt_sigpending)
2024 +#define __NR_x32_rt_sigtimedwait __NR_X32_SYSCALL(12)
2025 +__X32_SYSCALL(__NR_x32_rt_sigtimedwait, compat_sys_rt_sigtimedwait)
2026 +#define __NR_x32_rt_sigqueueinfo __NR_X32_SYSCALL(13)
2027 +__X32_SYSCALL(__NR_x32_rt_sigqueueinfo, sys32_rt_sigqueueinfo)
2028 +#define __NR_x32_sigaltstack __NR_X32_SYSCALL(14)
2029 +__X32_SYSCALL(__NR_x32_sigaltstack, stub_x32_sigaltstack)
2030 +#define __NR_x32_timer_create __NR_X32_SYSCALL(15)
2031 +__X32_SYSCALL(__NR_x32_timer_create, compat_sys_timer_create)
2032 +
2033 +#define __NR_x32_mq_notify __NR_X32_SYSCALL(16)
2034 +__X32_SYSCALL(__NR_x32_mq_notify, compat_sys_mq_notify)
2035 +#define __NR_x32_kexec_load __NR_X32_SYSCALL(17)
2036 +__X32_SYSCALL(__NR_x32_kexec_load, compat_sys_kexec_load)
2037 +#define __NR_x32_waitid __NR_X32_SYSCALL(18)
2038 +__X32_SYSCALL(__NR_x32_waitid, compat_sys_waitid)
2039 +#define __NR_x32_set_robust_list __NR_X32_SYSCALL(19)
2040 +__X32_SYSCALL(__NR_x32_set_robust_list, compat_sys_set_robust_list)
2041 +#define __NR_x32_get_robust_list __NR_X32_SYSCALL(20)
2042 +__X32_SYSCALL(__NR_x32_get_robust_list, compat_sys_get_robust_list)
2043 +#define __NR_x32_vmsplice __NR_X32_SYSCALL(21)
2044 +__X32_SYSCALL(__NR_x32_vmsplice, compat_sys_vmsplice)
2045 +#define __NR_x32_move_pages __NR_X32_SYSCALL(22)
2046 +__X32_SYSCALL(__NR_x32_move_pages, compat_sys_move_pages)
2047 +#define __NR_x32_preadv __NR_X32_SYSCALL(23)
2048 +__SYSCALL(__NR_x32_preadv, compat_sys_preadv64)
2049 +
2050 +#define __NR_x32_pwritev __NR_X32_SYSCALL(24)
2051 +__SYSCALL(__NR_x32_pwritev, compat_sys_pwritev64)
2052 +#define __NR_x32_rt_tgsigqueueinfo __NR_X32_SYSCALL(25)
2053 +__X32_SYSCALL(__NR_x32_rt_tgsigqueueinfo, compat_sys_rt_tgsigqueueinfo)
2054 +#define __NR_x32_recvmmsg __NR_X32_SYSCALL(26)
2055 +__SYSCALL(__NR_x32_recvmmsg, compat_sys_recvmmsg)
2056 +#define __NR_x32_sendmmsg __NR_X32_SYSCALL(27)
2057 +__SYSCALL(__NR_x32_sendmmsg, compat_sys_sendmmsg)
2058 +#define __NR_x32_process_vm_readv __NR_X32_SYSCALL(28)
2059 +__SYSCALL(__NR_x32_process_vm_readv, compat_sys_process_vm_readv)
2060 +#define __NR_x32_process_vm_writev __NR_X32_SYSCALL(29)
2061 +__SYSCALL(__NR_64_process_vm_writev, compat_sys_process_vm_writev)
2062
2063 #ifndef __NO_STUBS
2064 #define __ARCH_WANT_OLD_READDIR
2065 diff --git a/arch/x86/include/asm/unistd_64_compat.h b/arch/x86/include/asm/unistd_64_compat.h
2066 new file mode 100644
2067 index 0000000..0be9c1e
2068 --- /dev/null
2069 +++ b/arch/x86/include/asm/unistd_64_compat.h
2070 @@ -0,0 +1,37 @@
2071 +#ifndef _ASM_X86_UNISTD_64_COMPAT_H
2072 +#define _ASM_X86_UNISTD_64_COMPAT_H
2073 +
2074 +#define __NR_rt_sigaction __NR_64_rt_sigaction
2075 +#define __NR_rt_sigprocmask __NR_64_rt_sigprocmask
2076 +#define __NR_rt_sigreturn __NR_64_rt_sigreturn
2077 +#define __NR_ioctl __NR_64_ioctl
2078 +#define __NR_readv __NR_64_readv
2079 +#define __NR_writev __NR_64_writev
2080 +#define __NR_recvfrom __NR_64_recvfrom
2081 +#define __NR_sendmsg __NR_64_sendmsg
2082 +#define __NR_recvmsg __NR_64_recvmsg
2083 +#define __NR_execve __NR_64_execve
2084 +#define __NR_times __NR_64_times
2085 +#define __NR_rt_sigpending __NR_64_rt_sigpending
2086 +#define __NR_rt_sigtimedwait __NR_64_rt_sigtimedwait
2087 +#define __NR_rt_sigqueueinfo __NR_64_rt_sigqueueinfo
2088 +#define __NR_sigaltstack __NR_64_sigaltstack
2089 +#define __NR__sysctl __NR_64__sysctl
2090 +#define __NR_nfsservctl __NR_64_nfsservctl
2091 +#define __NR_timer_create __NR_64_timer_create
2092 +#define __NR_mq_notify __NR_64_mq_notify
2093 +#define __NR_kexec_load __NR_64_kexec_load
2094 +#define __NR_waitid __NR_64_waitid
2095 +#define __NR_set_robust_list __NR_64_set_robust_list
2096 +#define __NR_get_robust_list __NR_64_get_robust_list
2097 +#define __NR_vmsplice __NR_64_vmsplice
2098 +#define __NR_move_pages __NR_64_move_pages
2099 +#define __NR_preadv __NR_64_preadv
2100 +#define __NR_pwritev __NR_64_pwritev
2101 +#define __NR_rt_tgsigqueueinfo __NR_64_rt_tgsigqueueinfo
2102 +#define __NR_recvmmsg __NR_64_recvmmsg
2103 +#define __NR_sendmmsg __NR_64_sendmmsg
2104 +#define __NR_process_vm_readv __NR_64_process_vm_readv
2105 +#define __NR_process_vm_writev __NR_64_process_vm_writev
2106 +
2107 +#endif /* _ASM_X86_UNISTD_64_COMPAT_H */
2108 diff --git a/arch/x86/include/asm/unistd_x32.h b/arch/x86/include/asm/unistd_x32.h
2109 new file mode 100644
2110 index 0000000..c79c8f6
2111 --- /dev/null
2112 +++ b/arch/x86/include/asm/unistd_x32.h
2113 @@ -0,0 +1,734 @@
2114 +#ifndef _ASM_X86_UNISTD_X32_H
2115 +#define _ASM_X86_UNISTD_X32_H
2116 +
2117 +#ifndef __SYSCALL
2118 +#define __SYSCALL(a, b)
2119 +#endif
2120 +
2121 +#ifndef __X32_SYSCALL
2122 +#define __X32_SYSCALL(a, b)
2123 +#endif
2124 +
2125 +/* X32 system call mask. */
2126 +#define __X32_SYSCALL_BIT 0x40000000
2127 +
2128 +/* The first x32 system call. */
2129 +#define __X32_SYSCALL_BASE 512
2130 +
2131 +#ifdef __KERNEL__
2132 +#define __NR_COMMON_SYSCALL(n) (n)
2133 +#define __NR_X32_SYSCALL(n) (__X32_SYSCALL_BASE + n)
2134 +#else
2135 +#if __LP64__
2136 +#define __NR_COMMON_SYSCALL(n) (n)
2137 +#else
2138 +#define __NR_COMMON_SYSCALL(n) (__X32_SYSCALL_BIT | (n))
2139 +#endif
2140 +#define __NR_X32_SYSCALL(n) (__X32_SYSCALL_BIT | (__X32_SYSCALL_BASE + n))
2141 +#endif
2142 +
2143 +/*
2144 + * This file contains the system call numbers.
2145 + *
2146 + * Note: holes are not allowed.
2147 + */
2148 +
2149 +/* at least 8 syscall per cacheline */
2150 +#define __NR_read __NR_COMMON_SYSCALL(0)
2151 +__SYSCALL(__NR_read, sys_read)
2152 +#define __NR_write __NR_COMMON_SYSCALL(1)
2153 +__SYSCALL(__NR_write, sys_write)
2154 +#define __NR_open __NR_COMMON_SYSCALL(2)
2155 +__SYSCALL(__NR_open, sys_open)
2156 +#define __NR_close __NR_COMMON_SYSCALL(3)
2157 +__SYSCALL(__NR_close, sys_close)
2158 +#define __NR_stat __NR_COMMON_SYSCALL(4)
2159 +__SYSCALL(__NR_stat, sys_newstat)
2160 +#define __NR_fstat __NR_COMMON_SYSCALL(5)
2161 +__SYSCALL(__NR_fstat, sys_newfstat)
2162 +#define __NR_lstat __NR_COMMON_SYSCALL(6)
2163 +__SYSCALL(__NR_lstat, sys_newlstat)
2164 +#define __NR_poll __NR_COMMON_SYSCALL(7)
2165 +__SYSCALL(__NR_poll, sys_poll)
2166 +
2167 +#define __NR_lseek __NR_COMMON_SYSCALL(8)
2168 +__SYSCALL(__NR_lseek, sys_lseek)
2169 +#define __NR_mmap __NR_COMMON_SYSCALL(9)
2170 +__SYSCALL(__NR_mmap, sys_mmap)
2171 +#define __NR_mprotect __NR_COMMON_SYSCALL(10)
2172 +__SYSCALL(__NR_mprotect, sys_mprotect)
2173 +#define __NR_munmap __NR_COMMON_SYSCALL(11)
2174 +__SYSCALL(__NR_munmap, sys_munmap)
2175 +#define __NR_brk __NR_COMMON_SYSCALL(12)
2176 +__SYSCALL(__NR_brk, sys_brk)
2177 +
2178 +#define __NR_pread64 __NR_COMMON_SYSCALL(17)
2179 +__SYSCALL(__NR_pread64, sys_pread64)
2180 +#define __NR_pwrite64 __NR_COMMON_SYSCALL(18)
2181 +__SYSCALL(__NR_pwrite64, sys_pwrite64)
2182 +#define __NR_access __NR_COMMON_SYSCALL(21)
2183 +__SYSCALL(__NR_access, sys_access)
2184 +#define __NR_pipe __NR_COMMON_SYSCALL(22)
2185 +__SYSCALL(__NR_pipe, sys_pipe)
2186 +#define __NR_select __NR_COMMON_SYSCALL(23)
2187 +__SYSCALL(__NR_select, sys_select)
2188 +
2189 +#define __NR_sched_yield __NR_COMMON_SYSCALL(24)
2190 +__SYSCALL(__NR_sched_yield, sys_sched_yield)
2191 +#define __NR_mremap __NR_COMMON_SYSCALL(25)
2192 +__SYSCALL(__NR_mremap, sys_mremap)
2193 +#define __NR_msync __NR_COMMON_SYSCALL(26)
2194 +__SYSCALL(__NR_msync, sys_msync)
2195 +#define __NR_mincore __NR_COMMON_SYSCALL(27)
2196 +__SYSCALL(__NR_mincore, sys_mincore)
2197 +#define __NR_madvise __NR_COMMON_SYSCALL(28)
2198 +__SYSCALL(__NR_madvise, sys_madvise)
2199 +#define __NR_shmget __NR_COMMON_SYSCALL(29)
2200 +__SYSCALL(__NR_shmget, sys_shmget)
2201 +#define __NR_shmat __NR_COMMON_SYSCALL(30)
2202 +__SYSCALL(__NR_shmat, sys_shmat)
2203 +#define __NR_shmctl __NR_COMMON_SYSCALL(31)
2204 +__SYSCALL(__NR_shmctl, sys_shmctl)
2205 +
2206 +#define __NR_dup __NR_COMMON_SYSCALL(32)
2207 +__SYSCALL(__NR_dup, sys_dup)
2208 +#define __NR_dup2 __NR_COMMON_SYSCALL(33)
2209 +__SYSCALL(__NR_dup2, sys_dup2)
2210 +#define __NR_pause __NR_COMMON_SYSCALL(34)
2211 +__SYSCALL(__NR_pause, sys_pause)
2212 +#define __NR_nanosleep __NR_COMMON_SYSCALL(35)
2213 +__SYSCALL(__NR_nanosleep, sys_nanosleep)
2214 +#define __NR_getitimer __NR_COMMON_SYSCALL(36)
2215 +__SYSCALL(__NR_getitimer, sys_getitimer)
2216 +#define __NR_alarm __NR_COMMON_SYSCALL(37)
2217 +__SYSCALL(__NR_alarm, sys_alarm)
2218 +#define __NR_setitimer __NR_COMMON_SYSCALL(38)
2219 +__SYSCALL(__NR_setitimer, sys_setitimer)
2220 +#define __NR_getpid __NR_COMMON_SYSCALL(39)
2221 +__SYSCALL(__NR_getpid, sys_getpid)
2222 +
2223 +#define __NR_sendfile __NR_COMMON_SYSCALL(40)
2224 +__SYSCALL(__NR_sendfile, sys_sendfile64)
2225 +#define __NR_socket __NR_COMMON_SYSCALL(41)
2226 +__SYSCALL(__NR_socket, sys_socket)
2227 +#define __NR_connect __NR_COMMON_SYSCALL(42)
2228 +__SYSCALL(__NR_connect, sys_connect)
2229 +#define __NR_accept __NR_COMMON_SYSCALL(43)
2230 +__SYSCALL(__NR_accept, sys_accept)
2231 +#define __NR_sendto __NR_COMMON_SYSCALL(44)
2232 +__SYSCALL(__NR_sendto, sys_sendto)
2233 +
2234 +#define __NR_shutdown __NR_COMMON_SYSCALL(48)
2235 +__SYSCALL(__NR_shutdown, sys_shutdown)
2236 +#define __NR_bind __NR_COMMON_SYSCALL(49)
2237 +__SYSCALL(__NR_bind, sys_bind)
2238 +#define __NR_listen __NR_COMMON_SYSCALL(50)
2239 +__SYSCALL(__NR_listen, sys_listen)
2240 +#define __NR_getsockname __NR_COMMON_SYSCALL(51)
2241 +__SYSCALL(__NR_getsockname, sys_getsockname)
2242 +#define __NR_getpeername __NR_COMMON_SYSCALL(52)
2243 +__SYSCALL(__NR_getpeername, sys_getpeername)
2244 +#define __NR_socketpair __NR_COMMON_SYSCALL(53)
2245 +__SYSCALL(__NR_socketpair, sys_socketpair)
2246 +#define __NR_setsockopt __NR_COMMON_SYSCALL(54)
2247 +__SYSCALL(__NR_setsockopt, sys_setsockopt)
2248 +#define __NR_getsockopt __NR_COMMON_SYSCALL(55)
2249 +__SYSCALL(__NR_getsockopt, sys_getsockopt)
2250 +
2251 +#define __NR_clone __NR_COMMON_SYSCALL(56)
2252 +__SYSCALL(__NR_clone, stub_clone)
2253 +#define __NR_fork __NR_COMMON_SYSCALL(57)
2254 +__SYSCALL(__NR_fork, stub_fork)
2255 +#define __NR_vfork __NR_COMMON_SYSCALL(58)
2256 +__SYSCALL(__NR_vfork, stub_vfork)
2257 +#define __NR_exit __NR_COMMON_SYSCALL(60)
2258 +__SYSCALL(__NR_exit, sys_exit)
2259 +#define __NR_wait4 __NR_COMMON_SYSCALL(61)
2260 +__SYSCALL(__NR_wait4, sys_wait4)
2261 +#define __NR_kill __NR_COMMON_SYSCALL(62)
2262 +__SYSCALL(__NR_kill, sys_kill)
2263 +#define __NR_uname __NR_COMMON_SYSCALL(63)
2264 +__SYSCALL(__NR_uname, sys_newuname)
2265 +
2266 +#define __NR_semget __NR_COMMON_SYSCALL(64)
2267 +__SYSCALL(__NR_semget, sys_semget)
2268 +#define __NR_semop __NR_COMMON_SYSCALL(65)
2269 +__SYSCALL(__NR_semop, sys_semop)
2270 +#define __NR_semctl __NR_COMMON_SYSCALL(66)
2271 +__SYSCALL(__NR_semctl, sys_semctl)
2272 +#define __NR_shmdt __NR_COMMON_SYSCALL(67)
2273 +__SYSCALL(__NR_shmdt, sys_shmdt)
2274 +#define __NR_msgget __NR_COMMON_SYSCALL(68)
2275 +__SYSCALL(__NR_msgget, sys_msgget)
2276 +#define __NR_msgsnd __NR_COMMON_SYSCALL(69)
2277 +__SYSCALL(__NR_msgsnd, sys_msgsnd)
2278 +#define __NR_msgrcv __NR_COMMON_SYSCALL(70)
2279 +__SYSCALL(__NR_msgrcv, sys_msgrcv)
2280 +#define __NR_msgctl __NR_COMMON_SYSCALL(71)
2281 +__SYSCALL(__NR_msgctl, sys_msgctl)
2282 +
2283 +#define __NR_fcntl __NR_COMMON_SYSCALL(72)
2284 +__SYSCALL(__NR_fcntl, sys_fcntl)
2285 +#define __NR_flock __NR_COMMON_SYSCALL(73)
2286 +__SYSCALL(__NR_flock, sys_flock)
2287 +#define __NR_fsync __NR_COMMON_SYSCALL(74)
2288 +__SYSCALL(__NR_fsync, sys_fsync)
2289 +#define __NR_fdatasync __NR_COMMON_SYSCALL(75)
2290 +__SYSCALL(__NR_fdatasync, sys_fdatasync)
2291 +#define __NR_truncate __NR_COMMON_SYSCALL(76)
2292 +__SYSCALL(__NR_truncate, sys_truncate)
2293 +#define __NR_ftruncate __NR_COMMON_SYSCALL(77)
2294 +__SYSCALL(__NR_ftruncate, sys_ftruncate)
2295 +#define __NR_getcwd __NR_COMMON_SYSCALL(79)
2296 +__SYSCALL(__NR_getcwd, sys_getcwd)
2297 +
2298 +#define __NR_chdir __NR_COMMON_SYSCALL(80)
2299 +__SYSCALL(__NR_chdir, sys_chdir)
2300 +#define __NR_fchdir __NR_COMMON_SYSCALL(81)
2301 +__SYSCALL(__NR_fchdir, sys_fchdir)
2302 +#define __NR_rename __NR_COMMON_SYSCALL(82)
2303 +__SYSCALL(__NR_rename, sys_rename)
2304 +#define __NR_mkdir __NR_COMMON_SYSCALL(83)
2305 +__SYSCALL(__NR_mkdir, sys_mkdir)
2306 +#define __NR_rmdir __NR_COMMON_SYSCALL(84)
2307 +__SYSCALL(__NR_rmdir, sys_rmdir)
2308 +#define __NR_creat __NR_COMMON_SYSCALL(85)
2309 +__SYSCALL(__NR_creat, sys_creat)
2310 +#define __NR_link __NR_COMMON_SYSCALL(86)
2311 +__SYSCALL(__NR_link, sys_link)
2312 +#define __NR_unlink __NR_COMMON_SYSCALL(87)
2313 +__SYSCALL(__NR_unlink, sys_unlink)
2314 +
2315 +#define __NR_symlink __NR_COMMON_SYSCALL(88)
2316 +__SYSCALL(__NR_symlink, sys_symlink)
2317 +#define __NR_readlink __NR_COMMON_SYSCALL(89)
2318 +__SYSCALL(__NR_readlink, sys_readlink)
2319 +#define __NR_chmod __NR_COMMON_SYSCALL(90)
2320 +__SYSCALL(__NR_chmod, sys_chmod)
2321 +#define __NR_fchmod __NR_COMMON_SYSCALL(91)
2322 +__SYSCALL(__NR_fchmod, sys_fchmod)
2323 +#define __NR_chown __NR_COMMON_SYSCALL(92)
2324 +__SYSCALL(__NR_chown, sys_chown)
2325 +#define __NR_fchown __NR_COMMON_SYSCALL(93)
2326 +__SYSCALL(__NR_fchown, sys_fchown)
2327 +#define __NR_lchown __NR_COMMON_SYSCALL(94)
2328 +__SYSCALL(__NR_lchown, sys_lchown)
2329 +#define __NR_umask __NR_COMMON_SYSCALL(95)
2330 +__SYSCALL(__NR_umask, sys_umask)
2331 +
2332 +#define __NR_gettimeofday __NR_COMMON_SYSCALL(96)
2333 +__SYSCALL(__NR_gettimeofday, sys_gettimeofday)
2334 +#define __NR_getrlimit __NR_COMMON_SYSCALL(97)
2335 +__SYSCALL(__NR_getrlimit, sys_getrlimit)
2336 +#define __NR_getrusage __NR_COMMON_SYSCALL(98)
2337 +__SYSCALL(__NR_getrusage, sys_getrusage)
2338 +#define __NR_sysinfo __NR_COMMON_SYSCALL(99)
2339 +__SYSCALL(__NR_sysinfo, sys_sysinfo)
2340 +#define __NR_ptrace __NR_COMMON_SYSCALL(101)
2341 +__SYSCALL(__NR_ptrace, sys_ptrace)
2342 +#define __NR_getuid __NR_COMMON_SYSCALL(102)
2343 +__SYSCALL(__NR_getuid, sys_getuid)
2344 +#define __NR_syslog __NR_COMMON_SYSCALL(103)
2345 +__SYSCALL(__NR_syslog, sys_syslog)
2346 +
2347 +/* at the very end the stuff that never runs during the benchmarks */
2348 +#define __NR_getgid __NR_COMMON_SYSCALL(104)
2349 +__SYSCALL(__NR_getgid, sys_getgid)
2350 +#define __NR_setuid __NR_COMMON_SYSCALL(105)
2351 +__SYSCALL(__NR_setuid, sys_setuid)
2352 +#define __NR_setgid __NR_COMMON_SYSCALL(106)
2353 +__SYSCALL(__NR_setgid, sys_setgid)
2354 +#define __NR_geteuid __NR_COMMON_SYSCALL(107)
2355 +__SYSCALL(__NR_geteuid, sys_geteuid)
2356 +#define __NR_getegid __NR_COMMON_SYSCALL(108)
2357 +__SYSCALL(__NR_getegid, sys_getegid)
2358 +#define __NR_setpgid __NR_COMMON_SYSCALL(109)
2359 +__SYSCALL(__NR_setpgid, sys_setpgid)
2360 +#define __NR_getppid __NR_COMMON_SYSCALL(110)
2361 +__SYSCALL(__NR_getppid, sys_getppid)
2362 +#define __NR_getpgrp __NR_COMMON_SYSCALL(111)
2363 +__SYSCALL(__NR_getpgrp, sys_getpgrp)
2364 +
2365 +#define __NR_setsid __NR_COMMON_SYSCALL(112)
2366 +__SYSCALL(__NR_setsid, sys_setsid)
2367 +#define __NR_setreuid __NR_COMMON_SYSCALL(113)
2368 +__SYSCALL(__NR_setreuid, sys_setreuid)
2369 +#define __NR_setregid __NR_COMMON_SYSCALL(114)
2370 +__SYSCALL(__NR_setregid, sys_setregid)
2371 +#define __NR_getgroups __NR_COMMON_SYSCALL(115)
2372 +__SYSCALL(__NR_getgroups, sys_getgroups)
2373 +#define __NR_setgroups __NR_COMMON_SYSCALL(116)
2374 +__SYSCALL(__NR_setgroups, sys_setgroups)
2375 +#define __NR_setresuid __NR_COMMON_SYSCALL(117)
2376 +__SYSCALL(__NR_setresuid, sys_setresuid)
2377 +#define __NR_getresuid __NR_COMMON_SYSCALL(118)
2378 +__SYSCALL(__NR_getresuid, sys_getresuid)
2379 +#define __NR_setresgid __NR_COMMON_SYSCALL(119)
2380 +__SYSCALL(__NR_setresgid, sys_setresgid)
2381 +
2382 +#define __NR_getresgid __NR_COMMON_SYSCALL(120)
2383 +__SYSCALL(__NR_getresgid, sys_getresgid)
2384 +#define __NR_getpgid __NR_COMMON_SYSCALL(121)
2385 +__SYSCALL(__NR_getpgid, sys_getpgid)
2386 +#define __NR_setfsuid __NR_COMMON_SYSCALL(122)
2387 +__SYSCALL(__NR_setfsuid, sys_setfsuid)
2388 +#define __NR_setfsgid __NR_COMMON_SYSCALL(123)
2389 +__SYSCALL(__NR_setfsgid, sys_setfsgid)
2390 +#define __NR_getsid __NR_COMMON_SYSCALL(124)
2391 +__SYSCALL(__NR_getsid, sys_getsid)
2392 +#define __NR_capget __NR_COMMON_SYSCALL(125)
2393 +__SYSCALL(__NR_capget, sys_capget)
2394 +#define __NR_capset __NR_COMMON_SYSCALL(126)
2395 +__SYSCALL(__NR_capset, sys_capset)
2396 +
2397 +#define __NR_rt_sigsuspend __NR_COMMON_SYSCALL(130)
2398 +__SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend)
2399 +#define __NR_utime __NR_COMMON_SYSCALL(132)
2400 +__SYSCALL(__NR_utime, sys_utime)
2401 +#define __NR_mknod __NR_COMMON_SYSCALL(133)
2402 +__SYSCALL(__NR_mknod, sys_mknod)
2403 +
2404 +/* Only needed for a.out */
2405 +#define __NR_personality __NR_COMMON_SYSCALL(135)
2406 +__SYSCALL(__NR_personality, sys_personality)
2407 +
2408 +#define __NR_ustat __NR_COMMON_SYSCALL(136)
2409 +__SYSCALL(__NR_ustat, sys_ustat)
2410 +#define __NR_statfs __NR_COMMON_SYSCALL(137)
2411 +__SYSCALL(__NR_statfs, sys_statfs)
2412 +#define __NR_fstatfs __NR_COMMON_SYSCALL(138)
2413 +__SYSCALL(__NR_fstatfs, sys_fstatfs)
2414 +#define __NR_sysfs __NR_COMMON_SYSCALL(139)
2415 +__SYSCALL(__NR_sysfs, sys_sysfs)
2416 +
2417 +#define __NR_getpriority __NR_COMMON_SYSCALL(140)
2418 +__SYSCALL(__NR_getpriority, sys_getpriority)
2419 +#define __NR_setpriority __NR_COMMON_SYSCALL(141)
2420 +__SYSCALL(__NR_setpriority, sys_setpriority)
2421 +#define __NR_sched_setparam __NR_COMMON_SYSCALL(142)
2422 +__SYSCALL(__NR_sched_setparam, sys_sched_setparam)
2423 +#define __NR_sched_getparam __NR_COMMON_SYSCALL(143)
2424 +__SYSCALL(__NR_sched_getparam, sys_sched_getparam)
2425 +#define __NR_sched_setscheduler __NR_COMMON_SYSCALL(144)
2426 +__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)
2427 +#define __NR_sched_getscheduler __NR_COMMON_SYSCALL(145)
2428 +__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
2429 +#define __NR_sched_get_priority_max __NR_COMMON_SYSCALL(146)
2430 +__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
2431 +#define __NR_sched_get_priority_min __NR_COMMON_SYSCALL(147)
2432 +__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
2433 +#define __NR_sched_rr_get_interval __NR_COMMON_SYSCALL(148)
2434 +__SYSCALL(__NR_sched_rr_get_interval, sys_sched_rr_get_interval)
2435 +
2436 +#define __NR_mlock __NR_COMMON_SYSCALL(149)
2437 +__SYSCALL(__NR_mlock, sys_mlock)
2438 +#define __NR_munlock __NR_COMMON_SYSCALL(150)
2439 +__SYSCALL(__NR_munlock, sys_munlock)
2440 +#define __NR_mlockall __NR_COMMON_SYSCALL(151)
2441 +__SYSCALL(__NR_mlockall, sys_mlockall)
2442 +#define __NR_munlockall __NR_COMMON_SYSCALL(152)
2443 +__SYSCALL(__NR_munlockall, sys_munlockall)
2444 +
2445 +#define __NR_vhangup __NR_COMMON_SYSCALL(153)
2446 +__SYSCALL(__NR_vhangup, sys_vhangup)
2447 +
2448 +#define __NR_modify_ldt __NR_COMMON_SYSCALL(154)
2449 +__SYSCALL(__NR_modify_ldt, sys_modify_ldt)
2450 +
2451 +#define __NR_pivot_root __NR_COMMON_SYSCALL(155)
2452 +__SYSCALL(__NR_pivot_root, sys_pivot_root)
2453 +
2454 +
2455 +#define __NR_prctl __NR_COMMON_SYSCALL(157)
2456 +__SYSCALL(__NR_prctl, sys_prctl)
2457 +#define __NR_arch_prctl __NR_COMMON_SYSCALL(158)
2458 +__SYSCALL(__NR_arch_prctl, sys_arch_prctl)
2459 +
2460 +#define __NR_adjtimex __NR_COMMON_SYSCALL(159)
2461 +__SYSCALL(__NR_adjtimex, sys_adjtimex)
2462 +
2463 +#define __NR_setrlimit __NR_COMMON_SYSCALL(160)
2464 +__SYSCALL(__NR_setrlimit, sys_setrlimit)
2465 +
2466 +#define __NR_chroot __NR_COMMON_SYSCALL(161)
2467 +__SYSCALL(__NR_chroot, sys_chroot)
2468 +
2469 +#define __NR_sync __NR_COMMON_SYSCALL(162)
2470 +__SYSCALL(__NR_sync, sys_sync)
2471 +
2472 +#define __NR_acct __NR_COMMON_SYSCALL(163)
2473 +__SYSCALL(__NR_acct, sys_acct)
2474 +
2475 +#define __NR_settimeofday __NR_COMMON_SYSCALL(164)
2476 +__SYSCALL(__NR_settimeofday, sys_settimeofday)
2477 +
2478 +#define __NR_mount __NR_COMMON_SYSCALL(165)
2479 +__SYSCALL(__NR_mount, sys_mount)
2480 +#define __NR_umount2 __NR_COMMON_SYSCALL(166)
2481 +__SYSCALL(__NR_umount2, sys_umount)
2482 +
2483 +#define __NR_swapon __NR_COMMON_SYSCALL(167)
2484 +__SYSCALL(__NR_swapon, sys_swapon)
2485 +#define __NR_swapoff __NR_COMMON_SYSCALL(168)
2486 +__SYSCALL(__NR_swapoff, sys_swapoff)
2487 +
2488 +#define __NR_reboot __NR_COMMON_SYSCALL(169)
2489 +__SYSCALL(__NR_reboot, sys_reboot)
2490 +
2491 +#define __NR_sethostname __NR_COMMON_SYSCALL(170)
2492 +__SYSCALL(__NR_sethostname, sys_sethostname)
2493 +#define __NR_setdomainname __NR_COMMON_SYSCALL(171)
2494 +__SYSCALL(__NR_setdomainname, sys_setdomainname)
2495 +
2496 +#define __NR_iopl __NR_COMMON_SYSCALL(172)
2497 +__SYSCALL(__NR_iopl, stub_iopl)
2498 +#define __NR_ioperm __NR_COMMON_SYSCALL(173)
2499 +__SYSCALL(__NR_ioperm, sys_ioperm)
2500 +
2501 +#define __NR_init_module __NR_COMMON_SYSCALL(175)
2502 +__SYSCALL(__NR_init_module, sys_init_module)
2503 +#define __NR_delete_module __NR_COMMON_SYSCALL(176)
2504 +__SYSCALL(__NR_delete_module, sys_delete_module)
2505 +
2506 +#define __NR_quotactl __NR_COMMON_SYSCALL(179)
2507 +__SYSCALL(__NR_quotactl, sys_quotactl)
2508 +
2509 +
2510 +/* reserved for LiS/STREAMS */
2511 +#define __NR_getpmsg __NR_COMMON_SYSCALL(181)
2512 +__SYSCALL(__NR_getpmsg, sys_ni_syscall)
2513 +#define __NR_putpmsg __NR_COMMON_SYSCALL(182)
2514 +__SYSCALL(__NR_putpmsg, sys_ni_syscall)
2515 +
2516 +/* reserved for AFS */
2517 +#define __NR_afs_syscall __NR_COMMON_SYSCALL(183)
2518 +__SYSCALL(__NR_afs_syscall, sys_ni_syscall)
2519 +
2520 +/* reserved for tux */
2521 +#define __NR_tuxcall __NR_COMMON_SYSCALL(184)
2522 +__SYSCALL(__NR_tuxcall, sys_ni_syscall)
2523 +
2524 +#define __NR_security __NR_COMMON_SYSCALL(185)
2525 +__SYSCALL(__NR_security, sys_ni_syscall)
2526 +
2527 +#define __NR_gettid __NR_COMMON_SYSCALL(186)
2528 +__SYSCALL(__NR_gettid, sys_gettid)
2529 +
2530 +#define __NR_readahead __NR_COMMON_SYSCALL(187)
2531 +__SYSCALL(__NR_readahead, sys_readahead)
2532 +#define __NR_setxattr __NR_COMMON_SYSCALL(188)
2533 +__SYSCALL(__NR_setxattr, sys_setxattr)
2534 +#define __NR_lsetxattr __NR_COMMON_SYSCALL(189)
2535 +__SYSCALL(__NR_lsetxattr, sys_lsetxattr)
2536 +#define __NR_fsetxattr __NR_COMMON_SYSCALL(190)
2537 +__SYSCALL(__NR_fsetxattr, sys_fsetxattr)
2538 +#define __NR_getxattr __NR_COMMON_SYSCALL(191)
2539 +__SYSCALL(__NR_getxattr, sys_getxattr)
2540 +#define __NR_lgetxattr __NR_COMMON_SYSCALL(192)
2541 +__SYSCALL(__NR_lgetxattr, sys_lgetxattr)
2542 +#define __NR_fgetxattr __NR_COMMON_SYSCALL(193)
2543 +__SYSCALL(__NR_fgetxattr, sys_fgetxattr)
2544 +#define __NR_listxattr __NR_COMMON_SYSCALL(194)
2545 +__SYSCALL(__NR_listxattr, sys_listxattr)
2546 +#define __NR_llistxattr __NR_COMMON_SYSCALL(195)
2547 +__SYSCALL(__NR_llistxattr, sys_llistxattr)
2548 +#define __NR_flistxattr __NR_COMMON_SYSCALL(196)
2549 +__SYSCALL(__NR_flistxattr, sys_flistxattr)
2550 +#define __NR_removexattr __NR_COMMON_SYSCALL(197)
2551 +__SYSCALL(__NR_removexattr, sys_removexattr)
2552 +#define __NR_lremovexattr __NR_COMMON_SYSCALL(198)
2553 +__SYSCALL(__NR_lremovexattr, sys_lremovexattr)
2554 +#define __NR_fremovexattr __NR_COMMON_SYSCALL(199)
2555 +__SYSCALL(__NR_fremovexattr, sys_fremovexattr)
2556 +#define __NR_tkill __NR_COMMON_SYSCALL(200)
2557 +__SYSCALL(__NR_tkill, sys_tkill)
2558 +#define __NR_time __NR_COMMON_SYSCALL(201)
2559 +__SYSCALL(__NR_time, sys_time)
2560 +#define __NR_futex __NR_COMMON_SYSCALL(202)
2561 +__SYSCALL(__NR_futex, sys_futex)
2562 +#define __NR_sched_setaffinity __NR_COMMON_SYSCALL(203)
2563 +__SYSCALL(__NR_sched_setaffinity, sys_sched_setaffinity)
2564 +#define __NR_sched_getaffinity __NR_COMMON_SYSCALL(204)
2565 +__SYSCALL(__NR_sched_getaffinity, sys_sched_getaffinity)
2566 +#define __NR_io_setup __NR_COMMON_SYSCALL(206)
2567 +__SYSCALL(__NR_io_setup, sys_io_setup)
2568 +#define __NR_io_destroy __NR_COMMON_SYSCALL(207)
2569 +__SYSCALL(__NR_io_destroy, sys_io_destroy)
2570 +#define __NR_io_getevents __NR_COMMON_SYSCALL(208)
2571 +__SYSCALL(__NR_io_getevents, sys_io_getevents)
2572 +#define __NR_io_submit __NR_COMMON_SYSCALL(209)
2573 +__SYSCALL(__NR_io_submit, sys_io_submit)
2574 +#define __NR_io_cancel __NR_COMMON_SYSCALL(210)
2575 +__SYSCALL(__NR_io_cancel, sys_io_cancel)
2576 +#define __NR_lookup_dcookie __NR_COMMON_SYSCALL(212)
2577 +__SYSCALL(__NR_lookup_dcookie, sys_lookup_dcookie)
2578 +#define __NR_epoll_create __NR_COMMON_SYSCALL(213)
2579 +__SYSCALL(__NR_epoll_create, sys_epoll_create)
2580 +#define __NR_remap_file_pages __NR_COMMON_SYSCALL(216)
2581 +__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
2582 +#define __NR_getdents64 __NR_COMMON_SYSCALL(217)
2583 +__SYSCALL(__NR_getdents64, sys_getdents64)
2584 +#define __NR_set_tid_address __NR_COMMON_SYSCALL(218)
2585 +__SYSCALL(__NR_set_tid_address, sys_set_tid_address)
2586 +#define __NR_restart_syscall __NR_COMMON_SYSCALL(219)
2587 +__SYSCALL(__NR_restart_syscall, sys_restart_syscall)
2588 +#define __NR_semtimedop __NR_COMMON_SYSCALL(220)
2589 +__SYSCALL(__NR_semtimedop, sys_semtimedop)
2590 +#define __NR_fadvise64 __NR_COMMON_SYSCALL(221)
2591 +__SYSCALL(__NR_fadvise64, sys_fadvise64)
2592 +#define __NR_timer_settime __NR_COMMON_SYSCALL(223)
2593 +__SYSCALL(__NR_timer_settime, sys_timer_settime)
2594 +#define __NR_timer_gettime __NR_COMMON_SYSCALL(224)
2595 +__SYSCALL(__NR_timer_gettime, sys_timer_gettime)
2596 +#define __NR_timer_getoverrun __NR_COMMON_SYSCALL(225)
2597 +__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
2598 +#define __NR_timer_delete __NR_COMMON_SYSCALL(226)
2599 +__SYSCALL(__NR_timer_delete, sys_timer_delete)
2600 +#define __NR_clock_settime __NR_COMMON_SYSCALL(227)
2601 +__SYSCALL(__NR_clock_settime, sys_clock_settime)
2602 +#define __NR_clock_gettime __NR_COMMON_SYSCALL(228)
2603 +__SYSCALL(__NR_clock_gettime, sys_clock_gettime)
2604 +#define __NR_clock_getres __NR_COMMON_SYSCALL(229)
2605 +__SYSCALL(__NR_clock_getres, sys_clock_getres)
2606 +#define __NR_clock_nanosleep __NR_COMMON_SYSCALL(230)
2607 +__SYSCALL(__NR_clock_nanosleep, sys_clock_nanosleep)
2608 +#define __NR_exit_group __NR_COMMON_SYSCALL(231)
2609 +__SYSCALL(__NR_exit_group, sys_exit_group)
2610 +#define __NR_epoll_wait __NR_COMMON_SYSCALL(232)
2611 +__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
2612 +#define __NR_epoll_ctl __NR_COMMON_SYSCALL(233)
2613 +__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)
2614 +#define __NR_tgkill __NR_COMMON_SYSCALL(234)
2615 +__SYSCALL(__NR_tgkill, sys_tgkill)
2616 +#define __NR_utimes __NR_COMMON_SYSCALL(235)
2617 +__SYSCALL(__NR_utimes, sys_utimes)
2618 +#define __NR_mbind __NR_COMMON_SYSCALL(237)
2619 +__SYSCALL(__NR_mbind, sys_mbind)
2620 +#define __NR_set_mempolicy __NR_COMMON_SYSCALL(238)
2621 +__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)
2622 +#define __NR_get_mempolicy __NR_COMMON_SYSCALL(239)
2623 +__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)
2624 +#define __NR_mq_open __NR_COMMON_SYSCALL(240)
2625 +__SYSCALL(__NR_mq_open, sys_mq_open)
2626 +#define __NR_mq_unlink __NR_COMMON_SYSCALL(241)
2627 +__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
2628 +#define __NR_mq_timedsend __NR_COMMON_SYSCALL(242)
2629 +__SYSCALL(__NR_mq_timedsend, sys_mq_timedsend)
2630 +#define __NR_mq_timedreceive __NR_COMMON_SYSCALL(243)
2631 +__SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive)
2632 +#define __NR_mq_getsetattr __NR_COMMON_SYSCALL(245)
2633 +__SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr)
2634 +#define __NR_add_key __NR_COMMON_SYSCALL(248)
2635 +__SYSCALL(__NR_add_key, sys_add_key)
2636 +#define __NR_request_key __NR_COMMON_SYSCALL(249)
2637 +__SYSCALL(__NR_request_key, sys_request_key)
2638 +#define __NR_keyctl __NR_COMMON_SYSCALL(250)
2639 +__SYSCALL(__NR_keyctl, sys_keyctl)
2640 +#define __NR_ioprio_set __NR_COMMON_SYSCALL(251)
2641 +__SYSCALL(__NR_ioprio_set, sys_ioprio_set)
2642 +#define __NR_ioprio_get __NR_COMMON_SYSCALL(252)
2643 +__SYSCALL(__NR_ioprio_get, sys_ioprio_get)
2644 +#define __NR_inotify_init __NR_COMMON_SYSCALL(253)
2645 +__SYSCALL(__NR_inotify_init, sys_inotify_init)
2646 +#define __NR_inotify_add_watch __NR_COMMON_SYSCALL(254)
2647 +__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
2648 +#define __NR_inotify_rm_watch __NR_COMMON_SYSCALL(255)
2649 +__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
2650 +#define __NR_migrate_pages __NR_COMMON_SYSCALL(256)
2651 +__SYSCALL(__NR_migrate_pages, sys_migrate_pages)
2652 +#define __NR_openat __NR_COMMON_SYSCALL(257)
2653 +__SYSCALL(__NR_openat, sys_openat)
2654 +#define __NR_mkdirat __NR_COMMON_SYSCALL(258)
2655 +__SYSCALL(__NR_mkdirat, sys_mkdirat)
2656 +#define __NR_mknodat __NR_COMMON_SYSCALL(259)
2657 +__SYSCALL(__NR_mknodat, sys_mknodat)
2658 +#define __NR_fchownat __NR_COMMON_SYSCALL(260)
2659 +__SYSCALL(__NR_fchownat, sys_fchownat)
2660 +#define __NR_futimesat __NR_COMMON_SYSCALL(261)
2661 +__SYSCALL(__NR_futimesat, sys_futimesat)
2662 +#define __NR_newfstatat __NR_COMMON_SYSCALL(262)
2663 +__SYSCALL(__NR_newfstatat, sys_newfstatat)
2664 +#define __NR_unlinkat __NR_COMMON_SYSCALL(263)
2665 +__SYSCALL(__NR_unlinkat, sys_unlinkat)
2666 +#define __NR_renameat __NR_COMMON_SYSCALL(264)
2667 +__SYSCALL(__NR_renameat, sys_renameat)
2668 +#define __NR_linkat __NR_COMMON_SYSCALL(265)
2669 +__SYSCALL(__NR_linkat, sys_linkat)
2670 +#define __NR_symlinkat __NR_COMMON_SYSCALL(266)
2671 +__SYSCALL(__NR_symlinkat, sys_symlinkat)
2672 +#define __NR_readlinkat __NR_COMMON_SYSCALL(267)
2673 +__SYSCALL(__NR_readlinkat, sys_readlinkat)
2674 +#define __NR_fchmodat __NR_COMMON_SYSCALL(268)
2675 +__SYSCALL(__NR_fchmodat, sys_fchmodat)
2676 +#define __NR_faccessat __NR_COMMON_SYSCALL(269)
2677 +__SYSCALL(__NR_faccessat, sys_faccessat)
2678 +#define __NR_pselect6 __NR_COMMON_SYSCALL(270)
2679 +__SYSCALL(__NR_pselect6, sys_pselect6)
2680 +#define __NR_ppoll __NR_COMMON_SYSCALL(271)
2681 +__SYSCALL(__NR_ppoll, sys_ppoll)
2682 +#define __NR_unshare __NR_COMMON_SYSCALL(272)
2683 +__SYSCALL(__NR_unshare, sys_unshare)
2684 +#define __NR_splice __NR_COMMON_SYSCALL(275)
2685 +__SYSCALL(__NR_splice, sys_splice)
2686 +#define __NR_tee __NR_COMMON_SYSCALL(276)
2687 +__SYSCALL(__NR_tee, sys_tee)
2688 +#define __NR_sync_file_range __NR_COMMON_SYSCALL(277)
2689 +__SYSCALL(__NR_sync_file_range, sys_sync_file_range)
2690 +#define __NR_utimensat __NR_COMMON_SYSCALL(280)
2691 +__SYSCALL(__NR_utimensat, sys_utimensat)
2692 +#define __NR_epoll_pwait __NR_COMMON_SYSCALL(281)
2693 +__SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
2694 +#define __NR_signalfd __NR_COMMON_SYSCALL(282)
2695 +__SYSCALL(__NR_signalfd, sys_signalfd)
2696 +#define __NR_timerfd_create __NR_COMMON_SYSCALL(283)
2697 +__SYSCALL(__NR_timerfd_create, sys_timerfd_create)
2698 +#define __NR_eventfd __NR_COMMON_SYSCALL(284)
2699 +__SYSCALL(__NR_eventfd, sys_eventfd)
2700 +#define __NR_fallocate __NR_COMMON_SYSCALL(285)
2701 +__SYSCALL(__NR_fallocate, sys_fallocate)
2702 +#define __NR_timerfd_settime __NR_COMMON_SYSCALL(286)
2703 +__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime)
2704 +#define __NR_timerfd_gettime __NR_COMMON_SYSCALL(287)
2705 +__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)
2706 +#define __NR_accept4 __NR_COMMON_SYSCALL(288)
2707 +__SYSCALL(__NR_accept4, sys_accept4)
2708 +#define __NR_signalfd4 __NR_COMMON_SYSCALL(289)
2709 +__SYSCALL(__NR_signalfd4, sys_signalfd4)
2710 +#define __NR_eventfd2 __NR_COMMON_SYSCALL(290)
2711 +__SYSCALL(__NR_eventfd2, sys_eventfd2)
2712 +#define __NR_epoll_create1 __NR_COMMON_SYSCALL(291)
2713 +__SYSCALL(__NR_epoll_create1, sys_epoll_create1)
2714 +#define __NR_dup3 __NR_COMMON_SYSCALL(292)
2715 +__SYSCALL(__NR_dup3, sys_dup3)
2716 +#define __NR_pipe2 __NR_COMMON_SYSCALL(293)
2717 +__SYSCALL(__NR_pipe2, sys_pipe2)
2718 +#define __NR_inotify_init1 __NR_COMMON_SYSCALL(294)
2719 +__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
2720 +#define __NR_perf_event_open __NR_COMMON_SYSCALL(298)
2721 +__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
2722 +#define __NR_fanotify_init __NR_COMMON_SYSCALL(300)
2723 +__SYSCALL(__NR_fanotify_init, sys_fanotify_init)
2724 +#define __NR_fanotify_mark __NR_COMMON_SYSCALL(301)
2725 +__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)
2726 +#define __NR_prlimit64 __NR_COMMON_SYSCALL(302)
2727 +__SYSCALL(__NR_prlimit64, sys_prlimit64)
2728 +#define __NR_name_to_handle_at __NR_COMMON_SYSCALL(303)
2729 +__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
2730 +#define __NR_open_by_handle_at __NR_COMMON_SYSCALL(304)
2731 +__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)
2732 +#define __NR_clock_adjtime __NR_COMMON_SYSCALL(305)
2733 +__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)
2734 +#define __NR_syncfs __NR_COMMON_SYSCALL(306)
2735 +__SYSCALL(__NR_syncfs, sys_syncfs)
2736 +#define __NR_setns __NR_COMMON_SYSCALL(308)
2737 +__SYSCALL(__NR_setns, sys_setns)
2738 +#define __NR_getcpu __NR_COMMON_SYSCALL(309)
2739 +__SYSCALL(__NR_getcpu, sys_getcpu)
2740 +
2741 +/* X32 support. */
2742 +#define __NR_rt_sigaction __NR_X32_SYSCALL(0)
2743 +__X32_SYSCALL(__NR_rt_sigaction, sys32_rt_sigaction)
2744 +#define __NR_rt_sigprocmask __NR_X32_SYSCALL(1)
2745 +__X32_SYSCALL(__NR_rt_sigprocmask, sys32_rt_sigprocmask)
2746 +#define __NR_rt_sigreturn __NR_X32_SYSCALL(2)
2747 +__X32_SYSCALL(__NR_rt_sigreturn, stub_x32_rt_sigreturn)
2748 +#define __NR_ioctl __NR_X32_SYSCALL(3)
2749 +__X32_SYSCALL(__NR_ioctl, compat_sys_ioctl)
2750 +#define __NR_readv __NR_X32_SYSCALL(4)
2751 +__X32_SYSCALL(__NR_readv, compat_sys_readv)
2752 +#define __NR_writev __NR_X32_SYSCALL(5)
2753 +__X32_SYSCALL(__NR_writev, compat_sys_writev)
2754 +#define __NR_recvfrom __NR_X32_SYSCALL(6)
2755 +__X32_SYSCALL(__NR_recvfrom, compat_sys_recvfrom)
2756 +#define __NR_sendmsg __NR_X32_SYSCALL(7)
2757 +__X32_SYSCALL(__NR_sendmsg, compat_sys_sendmsg)
2758 +
2759 +#define __NR_recvmsg __NR_X32_SYSCALL(8)
2760 +__X32_SYSCALL(__NR_recvmsg, compat_sys_recvmsg)
2761 +#define __NR_execve __NR_X32_SYSCALL(9)
2762 +__X32_SYSCALL(__NR_execve, stub_x32_execve)
2763 +#define __NR_times __NR_X32_SYSCALL(10)
2764 +__X32_SYSCALL(__NR_times, compat_sys_times)
2765 +#define __NR_rt_sigpending __NR_X32_SYSCALL(11)
2766 +__X32_SYSCALL(__NR_rt_sigpending, sys32_rt_sigpending)
2767 +#define __NR_rt_sigtimedwait __NR_X32_SYSCALL(12)
2768 +__X32_SYSCALL(__NR_rt_sigtimedwait, compat_sys_rt_sigtimedwait)
2769 +#define __NR_rt_sigqueueinfo __NR_X32_SYSCALL(13)
2770 +__X32_SYSCALL(__NR_rt_sigqueueinfo, sys32_rt_sigqueueinfo)
2771 +#define __NR_sigaltstack __NR_X32_SYSCALL(14)
2772 +__X32_SYSCALL(__NR_sigaltstack, stub_x32_sigaltstack)
2773 +#define __NR_timer_create __NR_X32_SYSCALL(15)
2774 +__X32_SYSCALL(__NR_timer_create, compat_sys_timer_create)
2775 +
2776 +#define __NR_mq_notify __NR_X32_SYSCALL(16)
2777 +__X32_SYSCALL(__NR_mq_notify, compat_sys_mq_notify)
2778 +#define __NR_kexec_load __NR_X32_SYSCALL(17)
2779 +__X32_SYSCALL(__NR_kexec_load, compat_sys_kexec_load)
2780 +#define __NR_waitid __NR_X32_SYSCALL(18)
2781 +__X32_SYSCALL(__NR_waitid, compat_sys_waitid)
2782 +#define __NR_set_robust_list __NR_X32_SYSCALL(19)
2783 +__X32_SYSCALL(__NR_set_robust_list, compat_sys_set_robust_list)
2784 +#define __NR_get_robust_list __NR_X32_SYSCALL(20)
2785 +__X32_SYSCALL(__NR_get_robust_list, compat_sys_get_robust_list)
2786 +#define __NR_vmsplice __NR_X32_SYSCALL(21)
2787 +__X32_SYSCALL(__NR_vmsplice, compat_sys_vmsplice)
2788 +#define __NR_move_pages __NR_X32_SYSCALL(22)
2789 +__X32_SYSCALL(__NR_move_pages, compat_sys_move_pages)
2790 +#define __NR_preadv __NR_X32_SYSCALL(23)
2791 +__SYSCALL(__NR_preadv, compat_sys_preadv64)
2792 +
2793 +#define __NR_pwritev __NR_X32_SYSCALL(24)
2794 +__SYSCALL(__NR_pwritev, compat_sys_pwritev64)
2795 +#define __NR_rt_tgsigqueueinfo __NR_X32_SYSCALL(25)
2796 +__X32_SYSCALL(__NR_rt_tgsigqueueinfo, compat_sys_rt_tgsigqueueinfo)
2797 +#define __NR_recvmmsg __NR_X32_SYSCALL(26)
2798 +__SYSCALL(__NR_recvmmsg, compat_sys_recvmmsg)
2799 +#define __NR_sendmmsg __NR_X32_SYSCALL(27)
2800 +__SYSCALL(__NR_sendmmsg, compat_sys_sendmmsg)
2801 +#define __NR_process_vm_readv __NR_X32_SYSCALL(28)
2802 +__SYSCALL(__NR_process_vm_readv, compat_sys_process_vm_readv)
2803 +#define __NR_process_vm_writev __NR_X32_SYSCALL(29)
2804 +
2805 +#ifndef __NO_STUBS
2806 +#define __ARCH_WANT_OLD_READDIR
2807 +#define __ARCH_WANT_OLD_STAT
2808 +#define __ARCH_WANT_SYS_ALARM
2809 +#define __ARCH_WANT_SYS_GETHOSTNAME
2810 +#define __ARCH_WANT_SYS_PAUSE
2811 +#define __ARCH_WANT_SYS_SGETMASK
2812 +#define __ARCH_WANT_SYS_SIGNAL
2813 +#define __ARCH_WANT_SYS_UTIME
2814 +#define __ARCH_WANT_SYS_WAITPID
2815 +#define __ARCH_WANT_SYS_SOCKETCALL
2816 +#define __ARCH_WANT_SYS_FADVISE64
2817 +#define __ARCH_WANT_SYS_GETPGRP
2818 +#define __ARCH_WANT_SYS_LLSEEK
2819 +#define __ARCH_WANT_SYS_NICE
2820 +#define __ARCH_WANT_SYS_OLD_GETRLIMIT
2821 +#define __ARCH_WANT_SYS_OLD_UNAME
2822 +#define __ARCH_WANT_SYS_OLDUMOUNT
2823 +#define __ARCH_WANT_SYS_SIGPENDING
2824 +#define __ARCH_WANT_SYS_SIGPROCMASK
2825 +#define __ARCH_WANT_SYS_RT_SIGACTION
2826 +#define __ARCH_WANT_SYS_RT_SIGSUSPEND
2827 +#define __ARCH_WANT_SYS_TIME
2828 +#define __ARCH_WANT_COMPAT_SYS_TIME
2829 +#endif /* __NO_STUBS */
2830 +
2831 +#ifdef __KERNEL__
2832 +
2833 +#ifndef COMPILE_OFFSETS
2834 +#include <asm/asm-offsets.h>
2835 +#define NR_syscalls (__NR_syscall_max + 1)
2836 +#endif
2837 +
2838 +/*
2839 + * "Conditional" syscalls
2840 + *
2841 + * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
2842 + * but it doesn't work on all toolchains, so we just do it by hand
2843 + */
2844 +#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
2845 +#endif /* __KERNEL__ */
2846 +
2847 +#endif /* _ASM_X86_UNISTD_X32_H */
2848 diff --git a/include/asm-generic/types.h b/include/asm-generic/types.h
2849 index 7a0f69e..6566370 100644
2850 --- a/include/asm-generic/types.h
2851 +++ b/include/asm-generic/types.h
2852 @@ -12,4 +12,8 @@ typedef unsigned short umode_t;
2853
2854 #endif /* __ASSEMBLY__ */
2855
2856 +#ifndef __KERNEL_NATIVE_LONG_TYPE
2857 +#define __KERNEL_NATIVE_LONG_TYPE long
2858 +#endif
2859 +
2860 #endif /* _ASM_GENERIC_TYPES_H */
2861 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
2862 index 619b565..9485826 100644
2863 --- a/include/linux/Kbuild
2864 +++ b/include/linux/Kbuild
2865 @@ -352,6 +352,7 @@ header-y += suspend_ioctls.h
2866 header-y += swab.h
2867 header-y += synclink.h
2868 header-y += sysctl.h
2869 +header-y += sysinfo.h
2870 header-y += taskstats.h
2871 header-y += tcp.h
2872 header-y += telephony.h
2873 diff --git a/include/linux/aio_abi.h b/include/linux/aio_abi.h
2874 index 2c87316..0c3a4f3 100644
2875 --- a/include/linux/aio_abi.h
2876 +++ b/include/linux/aio_abi.h
2877 @@ -30,7 +30,7 @@
2878 #include <linux/types.h>
2879 #include <asm/byteorder.h>
2880
2881 -typedef unsigned long aio_context_t;
2882 +typedef unsigned __KERNEL_NATIVE_LONG_TYPE aio_context_t;
2883
2884 enum {
2885 IOCB_CMD_PREAD = 0,
2886 diff --git a/include/linux/compat.h b/include/linux/compat.h
2887 index 66ed067..ebc1b69 100644
2888 --- a/include/linux/compat.h
2889 +++ b/include/linux/compat.h
2890 @@ -19,6 +19,10 @@
2891 #include <asm/siginfo.h>
2892 #include <asm/signal.h>
2893
2894 +#ifndef COMPAT_USE_64BIT_TIME
2895 +#define COMPAT_USE_64BIT_TIME 0
2896 +#endif
2897 +
2898 #define compat_jiffies_to_clock_t(x) \
2899 (((unsigned long)(x) * COMPAT_USER_HZ) / HZ)
2900
2901 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
2902 index e8b1597..ecdf718 100644
2903 --- a/include/linux/kernel.h
2904 +++ b/include/linux/kernel.h
2905 @@ -732,22 +732,6 @@ extern int do_sysinfo(struct sysinfo *info);
2906
2907 #endif /* __KERNEL__ */
2908
2909 -#define SI_LOAD_SHIFT 16
2910 -struct sysinfo {
2911 - long uptime; /* Seconds since boot */
2912 - unsigned long loads[3]; /* 1, 5, and 15 minute load averages */
2913 - unsigned long totalram; /* Total usable main memory size */
2914 - unsigned long freeram; /* Available memory size */
2915 - unsigned long sharedram; /* Amount of shared memory */
2916 - unsigned long bufferram; /* Memory used by buffers */
2917 - unsigned long totalswap; /* Total swap space size */
2918 - unsigned long freeswap; /* swap space still available */
2919 - unsigned short procs; /* Number of current processes */
2920 - unsigned short pad; /* explicit padding for m68k */
2921 - unsigned long totalhigh; /* Total high memory size */
2922 - unsigned long freehigh; /* Available high memory size */
2923 - unsigned int mem_unit; /* Memory unit size in bytes */
2924 - char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
2925 -};
2926 +#include <linux/sysinfo.h>
2927
2928 #endif
2929 diff --git a/include/linux/sysinfo.h b/include/linux/sysinfo.h
2930 new file mode 100644
2931 index 0000000..bf475e6
2932 --- /dev/null
2933 +++ b/include/linux/sysinfo.h
2934 @@ -0,0 +1,38 @@
2935 +#ifndef _LINUX_SYSINFO_H
2936 +#define _LINUX_SYSINFO_H
2937 +
2938 +#include <linux/types.h>
2939 +
2940 +#define SI_LOAD_SHIFT 16
2941 +struct sysinfo {
2942 + /* Seconds since boot */
2943 + __KERNEL_NATIVE_LONG_TYPE uptime;
2944 + /* 1, 5, and 15 minute load averages */
2945 + unsigned __KERNEL_NATIVE_LONG_TYPE loads[3];
2946 + /* Total usable main memory size */
2947 + unsigned __KERNEL_NATIVE_LONG_TYPE totalram;
2948 + /* Available memory size */
2949 + unsigned __KERNEL_NATIVE_LONG_TYPE freeram;
2950 + /* Amount of shared memory */
2951 + unsigned __KERNEL_NATIVE_LONG_TYPE sharedram;
2952 + /* Memory used by buffers */
2953 + unsigned __KERNEL_NATIVE_LONG_TYPE bufferram;
2954 + /* Total swap space size */
2955 + unsigned __KERNEL_NATIVE_LONG_TYPE totalswap;
2956 + /* swap space still available */
2957 + unsigned __KERNEL_NATIVE_LONG_TYPE freeswap;
2958 + /* Number of current processes */
2959 + unsigned short procs;
2960 + /* explicit padding for m68k */
2961 + unsigned short pad;
2962 + /* Total high memory size */
2963 + unsigned __KERNEL_NATIVE_LONG_TYPE totalhigh;
2964 + /* Available high memory size */
2965 + unsigned __KERNEL_NATIVE_LONG_TYPE freehigh;
2966 + /* Memory unit size in bytes */
2967 + unsigned int mem_unit;
2968 + /* Padding: libc5 uses this.. */
2969 + char _f[20-2*sizeof(__KERNEL_NATIVE_LONG_TYPE)-sizeof(int)];
2970 +};
2971 +
2972 +#endif
2973 diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
2974 index 48462be..a35aeb8 100644
2975 --- a/scripts/headers_install.pl
2976 +++ b/scripts/headers_install.pl
2977 @@ -40,6 +40,7 @@ foreach my $file (@files) {
2978 $line =~ s/\b([us](8|16|32|64))\b/__$1/g;
2979 $line =~ s/\b(u_?int(8|16|32|64)_t)\b/__u$2/g;
2980 $line =~ s/\b(int(8|16|32|64)_t)\b/__s$2/g;
2981 + $line =~ s/__NR_64_/__NR_/g;
2982 printf {$out} "%s", $line;
2983 }
2984 close $out;
Report Message
Find on MARC Find on Google Groups