Skip to content

Commit 866128a

Browse files
Brian GerstKAGA-KOKO
authored andcommitted
x86/entry/32: Rename 32-bit specific syscalls
Rename the syscalls that only exist for 32-bit from x86_* to ia32_* to make it clear they are for 32-bit only. Also rename the functions to match the syscall name. Signed-off-by: Brian Gerst <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Dominik Brodowski <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent a845a6c commit 866128a

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

arch/x86/entry/syscalls/syscall_32.tbl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
87 i386 swapon sys_swapon
102102
88 i386 reboot sys_reboot
103103
89 i386 readdir sys_old_readdir compat_sys_old_readdir
104-
90 i386 mmap sys_old_mmap compat_sys_x86_mmap
104+
90 i386 mmap sys_old_mmap compat_sys_ia32_mmap
105105
91 i386 munmap sys_munmap
106106
92 i386 truncate sys_truncate compat_sys_truncate
107107
93 i386 ftruncate sys_ftruncate compat_sys_ftruncate
@@ -131,7 +131,7 @@
131131
117 i386 ipc sys_ipc compat_sys_ipc
132132
118 i386 fsync sys_fsync
133133
119 i386 sigreturn sys_sigreturn compat_sys_sigreturn
134-
120 i386 clone sys_clone compat_sys_x86_clone
134+
120 i386 clone sys_clone compat_sys_ia32_clone
135135
121 i386 setdomainname sys_setdomainname
136136
122 i386 uname sys_newuname
137137
123 i386 modify_ldt sys_modify_ldt
@@ -191,8 +191,8 @@
191191
177 i386 rt_sigtimedwait sys_rt_sigtimedwait_time32 compat_sys_rt_sigtimedwait_time32
192192
178 i386 rt_sigqueueinfo sys_rt_sigqueueinfo compat_sys_rt_sigqueueinfo
193193
179 i386 rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend
194-
180 i386 pread64 sys_pread64 compat_sys_x86_pread
195-
181 i386 pwrite64 sys_pwrite64 compat_sys_x86_pwrite
194+
180 i386 pread64 sys_pread64 compat_sys_ia32_pread64
195+
181 i386 pwrite64 sys_pwrite64 compat_sys_ia32_pwrite64
196196
182 i386 chown sys_chown16
197197
183 i386 getcwd sys_getcwd
198198
184 i386 capget sys_capget
@@ -204,11 +204,11 @@
204204
190 i386 vfork sys_vfork
205205
191 i386 ugetrlimit sys_getrlimit compat_sys_getrlimit
206206
192 i386 mmap2 sys_mmap_pgoff
207-
193 i386 truncate64 sys_truncate64 compat_sys_x86_truncate64
208-
194 i386 ftruncate64 sys_ftruncate64 compat_sys_x86_ftruncate64
209-
195 i386 stat64 sys_stat64 compat_sys_x86_stat64
210-
196 i386 lstat64 sys_lstat64 compat_sys_x86_lstat64
211-
197 i386 fstat64 sys_fstat64 compat_sys_x86_fstat64
207+
193 i386 truncate64 sys_truncate64 compat_sys_ia32_truncate64
208+
194 i386 ftruncate64 sys_ftruncate64 compat_sys_ia32_ftruncate64
209+
195 i386 stat64 sys_stat64 compat_sys_ia32_stat64
210+
196 i386 lstat64 sys_lstat64 compat_sys_ia32_lstat64
211+
197 i386 fstat64 sys_fstat64 compat_sys_ia32_fstat64
212212
198 i386 lchown32 sys_lchown
213213
199 i386 getuid32 sys_getuid
214214
200 i386 getgid32 sys_getgid
@@ -236,7 +236,7 @@
236236
# 222 is unused
237237
# 223 is unused
238238
224 i386 gettid sys_gettid
239-
225 i386 readahead sys_readahead compat_sys_x86_readahead
239+
225 i386 readahead sys_readahead compat_sys_ia32_readahead
240240
226 i386 setxattr sys_setxattr
241241
227 i386 lsetxattr sys_lsetxattr
242242
228 i386 fsetxattr sys_fsetxattr
@@ -261,7 +261,7 @@
261261
247 i386 io_getevents sys_io_getevents_time32
262262
248 i386 io_submit sys_io_submit compat_sys_io_submit
263263
249 i386 io_cancel sys_io_cancel
264-
250 i386 fadvise64 sys_fadvise64 compat_sys_x86_fadvise64
264+
250 i386 fadvise64 sys_fadvise64 compat_sys_ia32_fadvise64
265265
# 251 is available for reuse (was briefly sys_set_zone_reclaim)
266266
252 i386 exit_group sys_exit_group
267267
253 i386 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie
@@ -283,7 +283,7 @@
283283
269 i386 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64
284284
270 i386 tgkill sys_tgkill
285285
271 i386 utimes sys_utimes_time32
286-
272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_x86_fadvise64_64
286+
272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_ia32_fadvise64_64
287287
273 i386 vserver
288288
274 i386 mbind sys_mbind
289289
275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
@@ -311,7 +311,7 @@
311311
297 i386 mknodat sys_mknodat
312312
298 i386 fchownat sys_fchownat
313313
299 i386 futimesat sys_futimesat_time32
314-
300 i386 fstatat64 sys_fstatat64 compat_sys_x86_fstatat
314+
300 i386 fstatat64 sys_fstatat64 compat_sys_ia32_fstatat64
315315
301 i386 unlinkat sys_unlinkat
316316
302 i386 renameat sys_renameat
317317
303 i386 linkat sys_linkat
@@ -325,7 +325,7 @@
325325
311 i386 set_robust_list sys_set_robust_list compat_sys_set_robust_list
326326
312 i386 get_robust_list sys_get_robust_list compat_sys_get_robust_list
327327
313 i386 splice sys_splice
328-
314 i386 sync_file_range sys_sync_file_range compat_sys_x86_sync_file_range
328+
314 i386 sync_file_range sys_sync_file_range compat_sys_ia32_sync_file_range
329329
315 i386 tee sys_tee
330330
316 i386 vmsplice sys_vmsplice compat_sys_vmsplice
331331
317 i386 move_pages sys_move_pages compat_sys_move_pages
@@ -335,7 +335,7 @@
335335
321 i386 signalfd sys_signalfd compat_sys_signalfd
336336
322 i386 timerfd_create sys_timerfd_create
337337
323 i386 eventfd sys_eventfd
338-
324 i386 fallocate sys_fallocate compat_sys_x86_fallocate
338+
324 i386 fallocate sys_fallocate compat_sys_ia32_fallocate
339339
325 i386 timerfd_settime sys_timerfd_settime32
340340
326 i386 timerfd_gettime sys_timerfd_gettime32
341341
327 i386 signalfd4 sys_signalfd4 compat_sys_signalfd4

arch/x86/ia32/sys_ia32.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252
#define AA(__x) ((unsigned long)(__x))
5353

5454

55-
COMPAT_SYSCALL_DEFINE3(x86_truncate64, const char __user *, filename,
55+
COMPAT_SYSCALL_DEFINE3(ia32_truncate64, const char __user *, filename,
5656
unsigned long, offset_low, unsigned long, offset_high)
5757
{
5858
return ksys_truncate(filename,
5959
((loff_t) offset_high << 32) | offset_low);
6060
}
6161

62-
COMPAT_SYSCALL_DEFINE3(x86_ftruncate64, unsigned int, fd,
62+
COMPAT_SYSCALL_DEFINE3(ia32_ftruncate64, unsigned int, fd,
6363
unsigned long, offset_low, unsigned long, offset_high)
6464
{
6565
return ksys_ftruncate(fd, ((loff_t) offset_high << 32) | offset_low);
@@ -97,7 +97,7 @@ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
9797
return 0;
9898
}
9999

100-
COMPAT_SYSCALL_DEFINE2(x86_stat64, const char __user *, filename,
100+
COMPAT_SYSCALL_DEFINE2(ia32_stat64, const char __user *, filename,
101101
struct stat64 __user *, statbuf)
102102
{
103103
struct kstat stat;
@@ -108,7 +108,7 @@ COMPAT_SYSCALL_DEFINE2(x86_stat64, const char __user *, filename,
108108
return ret;
109109
}
110110

111-
COMPAT_SYSCALL_DEFINE2(x86_lstat64, const char __user *, filename,
111+
COMPAT_SYSCALL_DEFINE2(ia32_lstat64, const char __user *, filename,
112112
struct stat64 __user *, statbuf)
113113
{
114114
struct kstat stat;
@@ -118,7 +118,7 @@ COMPAT_SYSCALL_DEFINE2(x86_lstat64, const char __user *, filename,
118118
return ret;
119119
}
120120

121-
COMPAT_SYSCALL_DEFINE2(x86_fstat64, unsigned int, fd,
121+
COMPAT_SYSCALL_DEFINE2(ia32_fstat64, unsigned int, fd,
122122
struct stat64 __user *, statbuf)
123123
{
124124
struct kstat stat;
@@ -128,7 +128,7 @@ COMPAT_SYSCALL_DEFINE2(x86_fstat64, unsigned int, fd,
128128
return ret;
129129
}
130130

131-
COMPAT_SYSCALL_DEFINE4(x86_fstatat, unsigned int, dfd,
131+
COMPAT_SYSCALL_DEFINE4(ia32_fstatat64, unsigned int, dfd,
132132
const char __user *, filename,
133133
struct stat64 __user *, statbuf, int, flag)
134134
{
@@ -156,7 +156,7 @@ struct mmap_arg_struct32 {
156156
unsigned int offset;
157157
};
158158

159-
COMPAT_SYSCALL_DEFINE1(x86_mmap, struct mmap_arg_struct32 __user *, arg)
159+
COMPAT_SYSCALL_DEFINE1(ia32_mmap, struct mmap_arg_struct32 __user *, arg)
160160
{
161161
struct mmap_arg_struct32 a;
162162

@@ -171,14 +171,14 @@ COMPAT_SYSCALL_DEFINE1(x86_mmap, struct mmap_arg_struct32 __user *, arg)
171171
}
172172

173173
/* warning: next two assume little endian */
174-
COMPAT_SYSCALL_DEFINE5(x86_pread, unsigned int, fd, char __user *, ubuf,
174+
COMPAT_SYSCALL_DEFINE5(ia32_pread64, unsigned int, fd, char __user *, ubuf,
175175
u32, count, u32, poslo, u32, poshi)
176176
{
177177
return ksys_pread64(fd, ubuf, count,
178178
((loff_t)AA(poshi) << 32) | AA(poslo));
179179
}
180180

181-
COMPAT_SYSCALL_DEFINE5(x86_pwrite, unsigned int, fd, const char __user *, ubuf,
181+
COMPAT_SYSCALL_DEFINE5(ia32_pwrite64, unsigned int, fd, const char __user *, ubuf,
182182
u32, count, u32, poslo, u32, poshi)
183183
{
184184
return ksys_pwrite64(fd, ubuf, count,
@@ -190,7 +190,7 @@ COMPAT_SYSCALL_DEFINE5(x86_pwrite, unsigned int, fd, const char __user *, ubuf,
190190
* Some system calls that need sign extended arguments. This could be
191191
* done by a generic wrapper.
192192
*/
193-
COMPAT_SYSCALL_DEFINE6(x86_fadvise64_64, int, fd, __u32, offset_low,
193+
COMPAT_SYSCALL_DEFINE6(ia32_fadvise64_64, int, fd, __u32, offset_low,
194194
__u32, offset_high, __u32, len_low, __u32, len_high,
195195
int, advice)
196196
{
@@ -200,13 +200,13 @@ COMPAT_SYSCALL_DEFINE6(x86_fadvise64_64, int, fd, __u32, offset_low,
200200
advice);
201201
}
202202

203-
COMPAT_SYSCALL_DEFINE4(x86_readahead, int, fd, unsigned int, off_lo,
203+
COMPAT_SYSCALL_DEFINE4(ia32_readahead, int, fd, unsigned int, off_lo,
204204
unsigned int, off_hi, size_t, count)
205205
{
206206
return ksys_readahead(fd, ((u64)off_hi << 32) | off_lo, count);
207207
}
208208

209-
COMPAT_SYSCALL_DEFINE6(x86_sync_file_range, int, fd, unsigned int, off_low,
209+
COMPAT_SYSCALL_DEFINE6(ia32_sync_file_range, int, fd, unsigned int, off_low,
210210
unsigned int, off_hi, unsigned int, n_low,
211211
unsigned int, n_hi, int, flags)
212212
{
@@ -215,14 +215,14 @@ COMPAT_SYSCALL_DEFINE6(x86_sync_file_range, int, fd, unsigned int, off_low,
215215
((u64)n_hi << 32) | n_low, flags);
216216
}
217217

218-
COMPAT_SYSCALL_DEFINE5(x86_fadvise64, int, fd, unsigned int, offset_lo,
218+
COMPAT_SYSCALL_DEFINE5(ia32_fadvise64, int, fd, unsigned int, offset_lo,
219219
unsigned int, offset_hi, size_t, len, int, advice)
220220
{
221221
return ksys_fadvise64_64(fd, ((u64)offset_hi << 32) | offset_lo,
222222
len, advice);
223223
}
224224

225-
COMPAT_SYSCALL_DEFINE6(x86_fallocate, int, fd, int, mode,
225+
COMPAT_SYSCALL_DEFINE6(ia32_fallocate, int, fd, int, mode,
226226
unsigned int, offset_lo, unsigned int, offset_hi,
227227
unsigned int, len_lo, unsigned int, len_hi)
228228
{
@@ -233,7 +233,7 @@ COMPAT_SYSCALL_DEFINE6(x86_fallocate, int, fd, int, mode,
233233
/*
234234
* The 32-bit clone ABI is CONFIG_CLONE_BACKWARDS
235235
*/
236-
COMPAT_SYSCALL_DEFINE5(x86_clone, unsigned long, clone_flags,
236+
COMPAT_SYSCALL_DEFINE5(ia32_clone, unsigned long, clone_flags,
237237
unsigned long, newsp, int __user *, parent_tidptr,
238238
unsigned long, tls_val, int __user *, child_tidptr)
239239
{

0 commit comments

Comments
 (0)