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