Skip to content

Commit d5a0052

Browse files
Dominik BrodowskiIngo Molnar
Dominik Brodowski
authored and
Ingo Molnar
committed
syscalls/core, syscalls/x86: Rename struct pt_regs-based sys_*() to __x64_sys_*()
This rename allows us to have a coherent syscall stub naming convention on 64-bit x86 (0xffffffff prefix removed): 810f0af0 t kernel_waitid # common (32/64) kernel helper <inline> __do_sys_waitid # inlined helper doing actual work 810f0be0 t __se_sys_waitid # C func calling inlined helper <inline> __do_compat_sys_waitid # inlined helper doing actual work 810f0d80 t __se_compat_sys_waitid # compat C func calling inlined helper 810f2080 T __x64_sys_waitid # x64 64-bit-ptregs -> C stub 810f20b0 T __ia32_sys_waitid # ia32 32-bit-ptregs -> C stub[*] 810f2470 T __ia32_compat_sys_waitid # ia32 32-bit-ptregs -> compat C stub 810f2490 T __x32_compat_sys_waitid # x32 64-bit-ptregs -> compat C stub [*] This stub is unused, as the syscall table links __ia32_compat_sys_waitid instead of __ia32_sys_waitid as we need a compat variant here. Suggested-by: Ingo Molnar <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]> Cc: Al Viro <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 5ac9efa commit d5a0052

File tree

5 files changed

+405
-362
lines changed

5 files changed

+405
-362
lines changed

arch/x86/entry/syscalls/syscall_32.tbl

+23-23
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#
1212
# The abi is always "i386" for this file.
1313
#
14-
0 i386 restart_syscall sys_restart_syscall
14+
0 i386 restart_syscall sys_restart_syscall __ia32_sys_restart_syscall
1515
1 i386 exit sys_exit __ia32_sys_exit
16-
2 i386 fork sys_fork
16+
2 i386 fork sys_fork __ia32_sys_fork
1717
3 i386 read sys_read __ia32_sys_read
1818
4 i386 write sys_write __ia32_sys_write
1919
5 i386 open sys_open __ia32_compat_sys_open
@@ -31,23 +31,23 @@
3131
17 i386 break
3232
18 i386 oldstat sys_stat __ia32_sys_stat
3333
19 i386 lseek sys_lseek __ia32_compat_sys_lseek
34-
20 i386 getpid sys_getpid
34+
20 i386 getpid sys_getpid __ia32_sys_getpid
3535
21 i386 mount sys_mount __ia32_compat_sys_mount
3636
22 i386 umount sys_oldumount __ia32_sys_oldumount
3737
23 i386 setuid sys_setuid16 __ia32_sys_setuid16
38-
24 i386 getuid sys_getuid16
38+
24 i386 getuid sys_getuid16 __ia32_sys_getuid16
3939
25 i386 stime sys_stime __ia32_compat_sys_stime
4040
26 i386 ptrace sys_ptrace __ia32_compat_sys_ptrace
4141
27 i386 alarm sys_alarm __ia32_sys_alarm
4242
28 i386 oldfstat sys_fstat __ia32_sys_fstat
43-
29 i386 pause sys_pause
43+
29 i386 pause sys_pause __ia32_sys_pause
4444
30 i386 utime sys_utime __ia32_compat_sys_utime
4545
31 i386 stty
4646
32 i386 gtty
4747
33 i386 access sys_access __ia32_sys_access
4848
34 i386 nice sys_nice __ia32_sys_nice
4949
35 i386 ftime
50-
36 i386 sync sys_sync
50+
36 i386 sync sys_sync __ia32_sys_sync
5151
37 i386 kill sys_kill __ia32_sys_kill
5252
38 i386 rename sys_rename __ia32_sys_rename
5353
39 i386 mkdir sys_mkdir __ia32_sys_mkdir
@@ -58,10 +58,10 @@
5858
44 i386 prof
5959
45 i386 brk sys_brk __ia32_sys_brk
6060
46 i386 setgid sys_setgid16 __ia32_sys_setgid16
61-
47 i386 getgid sys_getgid16
61+
47 i386 getgid sys_getgid16 __ia32_sys_getgid16
6262
48 i386 signal sys_signal __ia32_sys_signal
63-
49 i386 geteuid sys_geteuid16
64-
50 i386 getegid sys_getegid16
63+
49 i386 geteuid sys_geteuid16 __ia32_sys_geteuid16
64+
50 i386 getegid sys_getegid16 __ia32_sys_getegid16
6565
51 i386 acct sys_acct __ia32_sys_acct
6666
52 i386 umount2 sys_umount __ia32_sys_umount
6767
53 i386 lock
@@ -75,11 +75,11 @@
7575
61 i386 chroot sys_chroot __ia32_sys_chroot
7676
62 i386 ustat sys_ustat __ia32_compat_sys_ustat
7777
63 i386 dup2 sys_dup2 __ia32_sys_dup2
78-
64 i386 getppid sys_getppid
79-
65 i386 getpgrp sys_getpgrp
80-
66 i386 setsid sys_setsid
78+
64 i386 getppid sys_getppid __ia32_sys_getppid
79+
65 i386 getpgrp sys_getpgrp __ia32_sys_getpgrp
80+
66 i386 setsid sys_setsid __ia32_sys_setsid
8181
67 i386 sigaction sys_sigaction __ia32_compat_sys_sigaction
82-
68 i386 sgetmask sys_sgetmask
82+
68 i386 sgetmask sys_sgetmask __ia32_sys_sgetmask
8383
69 i386 ssetmask sys_ssetmask __ia32_sys_ssetmask
8484
70 i386 setreuid sys_setreuid16 __ia32_sys_setreuid16
8585
71 i386 setregid sys_setregid16 __ia32_sys_setregid16
@@ -122,7 +122,7 @@
122122
108 i386 fstat sys_newfstat __ia32_compat_sys_newfstat
123123
109 i386 olduname sys_uname __ia32_sys_uname
124124
110 i386 iopl sys_iopl __ia32_sys_iopl
125-
111 i386 vhangup sys_vhangup
125+
111 i386 vhangup sys_vhangup __ia32_sys_vhangup
126126
112 i386 idle
127127
113 i386 vm86old sys_vm86old sys_ni_syscall
128128
114 i386 wait4 sys_wait4 __ia32_compat_sys_wait4
@@ -164,12 +164,12 @@
164164
150 i386 mlock sys_mlock __ia32_sys_mlock
165165
151 i386 munlock sys_munlock __ia32_sys_munlock
166166
152 i386 mlockall sys_mlockall __ia32_sys_mlockall
167-
153 i386 munlockall sys_munlockall
167+
153 i386 munlockall sys_munlockall __ia32_sys_munlockall
168168
154 i386 sched_setparam sys_sched_setparam __ia32_sys_sched_setparam
169169
155 i386 sched_getparam sys_sched_getparam __ia32_sys_sched_getparam
170170
156 i386 sched_setscheduler sys_sched_setscheduler __ia32_sys_sched_setscheduler
171171
157 i386 sched_getscheduler sys_sched_getscheduler __ia32_sys_sched_getscheduler
172-
158 i386 sched_yield sys_sched_yield
172+
158 i386 sched_yield sys_sched_yield __ia32_sys_sched_yield
173173
159 i386 sched_get_priority_max sys_sched_get_priority_max __ia32_sys_sched_get_priority_max
174174
160 i386 sched_get_priority_min sys_sched_get_priority_min __ia32_sys_sched_get_priority_min
175175
161 i386 sched_rr_get_interval sys_sched_rr_get_interval __ia32_compat_sys_sched_rr_get_interval
@@ -201,7 +201,7 @@
201201
187 i386 sendfile sys_sendfile __ia32_compat_sys_sendfile
202202
188 i386 getpmsg
203203
189 i386 putpmsg
204-
190 i386 vfork sys_vfork
204+
190 i386 vfork sys_vfork __ia32_sys_vfork
205205
191 i386 ugetrlimit sys_getrlimit __ia32_compat_sys_getrlimit
206206
192 i386 mmap2 sys_mmap_pgoff __ia32_sys_mmap_pgoff
207207
193 i386 truncate64 sys_truncate64 __ia32_compat_sys_x86_truncate64
@@ -210,10 +210,10 @@
210210
196 i386 lstat64 sys_lstat64 __ia32_compat_sys_x86_lstat64
211211
197 i386 fstat64 sys_fstat64 __ia32_compat_sys_x86_fstat64
212212
198 i386 lchown32 sys_lchown __ia32_sys_lchown
213-
199 i386 getuid32 sys_getuid
214-
200 i386 getgid32 sys_getgid
215-
201 i386 geteuid32 sys_geteuid
216-
202 i386 getegid32 sys_getegid
213+
199 i386 getuid32 sys_getuid __ia32_sys_getuid
214+
200 i386 getgid32 sys_getgid __ia32_sys_getgid
215+
201 i386 geteuid32 sys_geteuid __ia32_sys_geteuid
216+
202 i386 getegid32 sys_getegid __ia32_sys_getegid
217217
203 i386 setreuid32 sys_setreuid __ia32_sys_setreuid
218218
204 i386 setregid32 sys_setregid __ia32_sys_setregid
219219
205 i386 getgroups32 sys_getgroups __ia32_sys_getgroups
@@ -235,7 +235,7 @@
235235
221 i386 fcntl64 sys_fcntl64 __ia32_compat_sys_fcntl64
236236
# 222 is unused
237237
# 223 is unused
238-
224 i386 gettid sys_gettid
238+
224 i386 gettid sys_gettid __ia32_sys_gettid
239239
225 i386 readahead sys_readahead __ia32_compat_sys_x86_readahead
240240
226 i386 setxattr sys_setxattr __ia32_sys_setxattr
241241
227 i386 lsetxattr sys_lsetxattr __ia32_sys_lsetxattr
@@ -302,7 +302,7 @@
302302
288 i386 keyctl sys_keyctl __ia32_compat_sys_keyctl
303303
289 i386 ioprio_set sys_ioprio_set __ia32_sys_ioprio_set
304304
290 i386 ioprio_get sys_ioprio_get __ia32_sys_ioprio_get
305-
291 i386 inotify_init sys_inotify_init
305+
291 i386 inotify_init sys_inotify_init __ia32_sys_inotify_init
306306
292 i386 inotify_add_watch sys_inotify_add_watch __ia32_sys_inotify_add_watch
307307
293 i386 inotify_rm_watch sys_inotify_rm_watch __ia32_sys_inotify_rm_watch
308308
294 i386 migrate_pages sys_migrate_pages __ia32_sys_migrate_pages

0 commit comments

Comments
 (0)