Skip to content

Commit 8dabe72

Browse files
arndbarndb
committed
y2038: syscalls: rename y2038 compat syscalls
A lot of system calls that pass a time_t somewhere have an implementation using a COMPAT_SYSCALL_DEFINEx() on 64-bit architectures, and have been reworked so that this implementation can now be used on 32-bit architectures as well. The missing step is to redefine them using the regular SYSCALL_DEFINEx() to get them out of the compat namespace and make it possible to build them on 32-bit architectures. Any system call that ends in 'time' gets a '32' suffix on its name for that version, while the others get a '_time32' suffix, to distinguish them from the normal version, which takes a 64-bit time argument in the future. In this step, only 64-bit architectures are changed, doing this rename first lets us avoid touching the 32-bit architectures twice. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 7948450 commit 8dabe72

File tree

26 files changed

+361
-367
lines changed

26 files changed

+361
-367
lines changed

‎arch/arm64/include/asm/unistd32.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ __SYSCALL(__NR_uname, sys_newuname)
270270
/* 123 was sys_modify_ldt */
271271
__SYSCALL(123, sys_ni_syscall)
272272
#define __NR_adjtimex 124
273-
__SYSCALL(__NR_adjtimex, compat_sys_adjtimex)
273+
__SYSCALL(__NR_adjtimex, sys_adjtimex_time32)
274274
#define __NR_mprotect 125
275275
__SYSCALL(__NR_mprotect, sys_mprotect)
276276
#define __NR_sigprocmask 126
@@ -344,9 +344,9 @@ __SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
344344
#define __NR_sched_get_priority_min 160
345345
__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
346346
#define __NR_sched_rr_get_interval 161
347-
__SYSCALL(__NR_sched_rr_get_interval, compat_sys_sched_rr_get_interval)
347+
__SYSCALL(__NR_sched_rr_get_interval, sys_sched_rr_get_interval_time32)
348348
#define __NR_nanosleep 162
349-
__SYSCALL(__NR_nanosleep, compat_sys_nanosleep)
349+
__SYSCALL(__NR_nanosleep, sys_nanosleep_time32)
350350
#define __NR_mremap 163
351351
__SYSCALL(__NR_mremap, sys_mremap)
352352
#define __NR_setresuid 164
@@ -376,7 +376,7 @@ __SYSCALL(__NR_rt_sigprocmask, compat_sys_rt_sigprocmask)
376376
#define __NR_rt_sigpending 176
377377
__SYSCALL(__NR_rt_sigpending, compat_sys_rt_sigpending)
378378
#define __NR_rt_sigtimedwait 177
379-
__SYSCALL(__NR_rt_sigtimedwait, compat_sys_rt_sigtimedwait)
379+
__SYSCALL(__NR_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time32)
380380
#define __NR_rt_sigqueueinfo 178
381381
__SYSCALL(__NR_rt_sigqueueinfo, compat_sys_rt_sigqueueinfo)
382382
#define __NR_rt_sigsuspend 179
@@ -502,7 +502,7 @@ __SYSCALL(__NR_tkill, sys_tkill)
502502
#define __NR_sendfile64 239
503503
__SYSCALL(__NR_sendfile64, sys_sendfile64)
504504
#define __NR_futex 240
505-
__SYSCALL(__NR_futex, compat_sys_futex)
505+
__SYSCALL(__NR_futex, sys_futex_time32)
506506
#define __NR_sched_setaffinity 241
507507
__SYSCALL(__NR_sched_setaffinity, compat_sys_sched_setaffinity)
508508
#define __NR_sched_getaffinity 242
@@ -512,7 +512,7 @@ __SYSCALL(__NR_io_setup, compat_sys_io_setup)
512512
#define __NR_io_destroy 244
513513
__SYSCALL(__NR_io_destroy, sys_io_destroy)
514514
#define __NR_io_getevents 245
515-
__SYSCALL(__NR_io_getevents, compat_sys_io_getevents)
515+
__SYSCALL(__NR_io_getevents, sys_io_getevents_time32)
516516
#define __NR_io_submit 246
517517
__SYSCALL(__NR_io_submit, compat_sys_io_submit)
518518
#define __NR_io_cancel 247
@@ -538,29 +538,29 @@ __SYSCALL(__NR_set_tid_address, sys_set_tid_address)
538538
#define __NR_timer_create 257
539539
__SYSCALL(__NR_timer_create, compat_sys_timer_create)
540540
#define __NR_timer_settime 258
541-
__SYSCALL(__NR_timer_settime, compat_sys_timer_settime)
541+
__SYSCALL(__NR_timer_settime, sys_timer_settime32)
542542
#define __NR_timer_gettime 259
543-
__SYSCALL(__NR_timer_gettime, compat_sys_timer_gettime)
543+
__SYSCALL(__NR_timer_gettime, sys_timer_gettime32)
544544
#define __NR_timer_getoverrun 260
545545
__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
546546
#define __NR_timer_delete 261
547547
__SYSCALL(__NR_timer_delete, sys_timer_delete)
548548
#define __NR_clock_settime 262
549-
__SYSCALL(__NR_clock_settime, compat_sys_clock_settime)
549+
__SYSCALL(__NR_clock_settime, sys_clock_settime32)
550550
#define __NR_clock_gettime 263
551-
__SYSCALL(__NR_clock_gettime, compat_sys_clock_gettime)
551+
__SYSCALL(__NR_clock_gettime, sys_clock_gettime32)
552552
#define __NR_clock_getres 264
553-
__SYSCALL(__NR_clock_getres, compat_sys_clock_getres)
553+
__SYSCALL(__NR_clock_getres, sys_clock_getres_time32)
554554
#define __NR_clock_nanosleep 265
555-
__SYSCALL(__NR_clock_nanosleep, compat_sys_clock_nanosleep)
555+
__SYSCALL(__NR_clock_nanosleep, sys_clock_nanosleep_time32)
556556
#define __NR_statfs64 266
557557
__SYSCALL(__NR_statfs64, compat_sys_aarch32_statfs64)
558558
#define __NR_fstatfs64 267
559559
__SYSCALL(__NR_fstatfs64, compat_sys_aarch32_fstatfs64)
560560
#define __NR_tgkill 268
561561
__SYSCALL(__NR_tgkill, sys_tgkill)
562562
#define __NR_utimes 269
563-
__SYSCALL(__NR_utimes, compat_sys_utimes)
563+
__SYSCALL(__NR_utimes, sys_utimes_time32)
564564
#define __NR_arm_fadvise64_64 270
565565
__SYSCALL(__NR_arm_fadvise64_64, compat_sys_aarch32_fadvise64_64)
566566
#define __NR_pciconfig_iobase 271
@@ -574,9 +574,9 @@ __SYSCALL(__NR_mq_open, compat_sys_mq_open)
574574
#define __NR_mq_unlink 275
575575
__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
576576
#define __NR_mq_timedsend 276
577-
__SYSCALL(__NR_mq_timedsend, compat_sys_mq_timedsend)
577+
__SYSCALL(__NR_mq_timedsend, sys_mq_timedsend_time32)
578578
#define __NR_mq_timedreceive 277
579-
__SYSCALL(__NR_mq_timedreceive, compat_sys_mq_timedreceive)
579+
__SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive_time32)
580580
#define __NR_mq_notify 278
581581
__SYSCALL(__NR_mq_notify, compat_sys_mq_notify)
582582
#define __NR_mq_getsetattr 279
@@ -646,7 +646,7 @@ __SYSCALL(__NR_request_key, sys_request_key)
646646
#define __NR_keyctl 311
647647
__SYSCALL(__NR_keyctl, compat_sys_keyctl)
648648
#define __NR_semtimedop 312
649-
__SYSCALL(__NR_semtimedop, compat_sys_semtimedop)
649+
__SYSCALL(__NR_semtimedop, sys_semtimedop_time32)
650650
#define __NR_vserver 313
651651
__SYSCALL(__NR_vserver, sys_ni_syscall)
652652
#define __NR_ioprio_set 314
@@ -674,7 +674,7 @@ __SYSCALL(__NR_mknodat, sys_mknodat)
674674
#define __NR_fchownat 325
675675
__SYSCALL(__NR_fchownat, sys_fchownat)
676676
#define __NR_futimesat 326
677-
__SYSCALL(__NR_futimesat, compat_sys_futimesat)
677+
__SYSCALL(__NR_futimesat, sys_futimesat_time32)
678678
#define __NR_fstatat64 327
679679
__SYSCALL(__NR_fstatat64, sys_fstatat64)
680680
#define __NR_unlinkat 328
@@ -692,9 +692,9 @@ __SYSCALL(__NR_fchmodat, sys_fchmodat)
692692
#define __NR_faccessat 334
693693
__SYSCALL(__NR_faccessat, sys_faccessat)
694694
#define __NR_pselect6 335
695-
__SYSCALL(__NR_pselect6, compat_sys_pselect6)
695+
__SYSCALL(__NR_pselect6, compat_sys_pselect6_time32)
696696
#define __NR_ppoll 336
697-
__SYSCALL(__NR_ppoll, compat_sys_ppoll)
697+
__SYSCALL(__NR_ppoll, compat_sys_ppoll_time32)
698698
#define __NR_unshare 337
699699
__SYSCALL(__NR_unshare, sys_unshare)
700700
#define __NR_set_robust_list 338
@@ -718,7 +718,7 @@ __SYSCALL(__NR_epoll_pwait, compat_sys_epoll_pwait)
718718
#define __NR_kexec_load 347
719719
__SYSCALL(__NR_kexec_load, compat_sys_kexec_load)
720720
#define __NR_utimensat 348
721-
__SYSCALL(__NR_utimensat, compat_sys_utimensat)
721+
__SYSCALL(__NR_utimensat, sys_utimensat_time32)
722722
#define __NR_signalfd 349
723723
__SYSCALL(__NR_signalfd, compat_sys_signalfd)
724724
#define __NR_timerfd_create 350
@@ -728,9 +728,9 @@ __SYSCALL(__NR_eventfd, sys_eventfd)
728728
#define __NR_fallocate 352
729729
__SYSCALL(__NR_fallocate, compat_sys_aarch32_fallocate)
730730
#define __NR_timerfd_settime 353
731-
__SYSCALL(__NR_timerfd_settime, compat_sys_timerfd_settime)
731+
__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime32)
732732
#define __NR_timerfd_gettime 354
733-
__SYSCALL(__NR_timerfd_gettime, compat_sys_timerfd_gettime)
733+
__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime32)
734734
#define __NR_signalfd4 355
735735
__SYSCALL(__NR_signalfd4, compat_sys_signalfd4)
736736
#define __NR_eventfd2 356
@@ -752,7 +752,7 @@ __SYSCALL(__NR_rt_tgsigqueueinfo, compat_sys_rt_tgsigqueueinfo)
752752
#define __NR_perf_event_open 364
753753
__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
754754
#define __NR_recvmmsg 365
755-
__SYSCALL(__NR_recvmmsg, compat_sys_recvmmsg)
755+
__SYSCALL(__NR_recvmmsg, compat_sys_recvmmsg_time32)
756756
#define __NR_accept4 366
757757
__SYSCALL(__NR_accept4, sys_accept4)
758758
#define __NR_fanotify_init 367
@@ -766,7 +766,7 @@ __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
766766
#define __NR_open_by_handle_at 371
767767
__SYSCALL(__NR_open_by_handle_at, compat_sys_open_by_handle_at)
768768
#define __NR_clock_adjtime 372
769-
__SYSCALL(__NR_clock_adjtime, compat_sys_clock_adjtime)
769+
__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime32)
770770
#define __NR_syncfs 373
771771
__SYSCALL(__NR_syncfs, sys_syncfs)
772772
#define __NR_sendmmsg 374

‎arch/mips/kernel/syscalls/syscall_n32.tbl

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
31 n32 dup sys_dup
4242
32 n32 dup2 sys_dup2
4343
33 n32 pause sys_pause
44-
34 n32 nanosleep compat_sys_nanosleep
44+
34 n32 nanosleep sys_nanosleep_time32
4545
35 n32 getitimer compat_sys_getitimer
4646
36 n32 setitimer compat_sys_setitimer
4747
37 n32 alarm sys_alarm
@@ -133,11 +133,11 @@
133133
123 n32 capget sys_capget
134134
124 n32 capset sys_capset
135135
125 n32 rt_sigpending compat_sys_rt_sigpending
136-
126 n32 rt_sigtimedwait compat_sys_rt_sigtimedwait
136+
126 n32 rt_sigtimedwait compat_sys_rt_sigtimedwait_time32
137137
127 n32 rt_sigqueueinfo compat_sys_rt_sigqueueinfo
138138
128 n32 rt_sigsuspend compat_sys_rt_sigsuspend
139139
129 n32 sigaltstack compat_sys_sigaltstack
140-
130 n32 utime compat_sys_utime
140+
130 n32 utime sys_utime32
141141
131 n32 mknod sys_mknod
142142
132 n32 personality sys_32_personality
143143
133 n32 ustat compat_sys_ustat
@@ -152,7 +152,7 @@
152152
142 n32 sched_getscheduler sys_sched_getscheduler
153153
143 n32 sched_get_priority_max sys_sched_get_priority_max
154154
144 n32 sched_get_priority_min sys_sched_get_priority_min
155-
145 n32 sched_rr_get_interval compat_sys_sched_rr_get_interval
155+
145 n32 sched_rr_get_interval sys_sched_rr_get_interval_time32
156156
146 n32 mlock sys_mlock
157157
147 n32 munlock sys_munlock
158158
148 n32 mlockall sys_mlockall
@@ -161,7 +161,7 @@
161161
151 n32 pivot_root sys_pivot_root
162162
152 n32 _sysctl compat_sys_sysctl
163163
153 n32 prctl sys_prctl
164-
154 n32 adjtimex compat_sys_adjtimex
164+
154 n32 adjtimex sys_adjtimex_time32
165165
155 n32 setrlimit compat_sys_setrlimit
166166
156 n32 chroot sys_chroot
167167
157 n32 sync sys_sync
@@ -202,15 +202,15 @@
202202
191 n32 fremovexattr sys_fremovexattr
203203
192 n32 tkill sys_tkill
204204
193 n32 reserved193 sys_ni_syscall
205-
194 n32 futex compat_sys_futex
205+
194 n32 futex sys_futex_time32
206206
195 n32 sched_setaffinity compat_sys_sched_setaffinity
207207
196 n32 sched_getaffinity compat_sys_sched_getaffinity
208208
197 n32 cacheflush sys_cacheflush
209209
198 n32 cachectl sys_cachectl
210210
199 n32 sysmips __sys_sysmips
211211
200 n32 io_setup compat_sys_io_setup
212212
201 n32 io_destroy sys_io_destroy
213-
202 n32 io_getevents compat_sys_io_getevents
213+
202 n32 io_getevents sys_io_getevents_time32
214214
203 n32 io_submit compat_sys_io_submit
215215
204 n32 io_cancel sys_io_cancel
216216
205 n32 exit_group sys_exit_group
@@ -223,29 +223,29 @@
223223
212 n32 fcntl64 compat_sys_fcntl64
224224
213 n32 set_tid_address sys_set_tid_address
225225
214 n32 restart_syscall sys_restart_syscall
226-
215 n32 semtimedop compat_sys_semtimedop
226+
215 n32 semtimedop sys_semtimedop_time32
227227
216 n32 fadvise64 sys_fadvise64_64
228228
217 n32 statfs64 compat_sys_statfs64
229229
218 n32 fstatfs64 compat_sys_fstatfs64
230230
219 n32 sendfile64 sys_sendfile64
231231
220 n32 timer_create compat_sys_timer_create
232-
221 n32 timer_settime compat_sys_timer_settime
233-
222 n32 timer_gettime compat_sys_timer_gettime
232+
221 n32 timer_settime sys_timer_settime32
233+
222 n32 timer_gettime sys_timer_gettime32
234234
223 n32 timer_getoverrun sys_timer_getoverrun
235235
224 n32 timer_delete sys_timer_delete
236-
225 n32 clock_settime compat_sys_clock_settime
237-
226 n32 clock_gettime compat_sys_clock_gettime
238-
227 n32 clock_getres compat_sys_clock_getres
239-
228 n32 clock_nanosleep compat_sys_clock_nanosleep
236+
225 n32 clock_settime sys_clock_settime32
237+
226 n32 clock_gettime sys_clock_gettime32
238+
227 n32 clock_getres sys_clock_getres_time32
239+
228 n32 clock_nanosleep sys_clock_nanosleep_time32
240240
229 n32 tgkill sys_tgkill
241-
230 n32 utimes compat_sys_utimes
241+
230 n32 utimes sys_utimes_time32
242242
231 n32 mbind compat_sys_mbind
243243
232 n32 get_mempolicy compat_sys_get_mempolicy
244244
233 n32 set_mempolicy compat_sys_set_mempolicy
245245
234 n32 mq_open compat_sys_mq_open
246246
235 n32 mq_unlink sys_mq_unlink
247-
236 n32 mq_timedsend compat_sys_mq_timedsend
248-
237 n32 mq_timedreceive compat_sys_mq_timedreceive
247+
236 n32 mq_timedsend sys_mq_timedsend_time32
248+
237 n32 mq_timedreceive sys_mq_timedreceive_time32
249249
238 n32 mq_notify compat_sys_mq_notify
250250
239 n32 mq_getsetattr compat_sys_mq_getsetattr
251251
240 n32 vserver sys_ni_syscall
@@ -263,7 +263,7 @@
263263
252 n32 mkdirat sys_mkdirat
264264
253 n32 mknodat sys_mknodat
265265
254 n32 fchownat sys_fchownat
266-
255 n32 futimesat compat_sys_futimesat
266+
255 n32 futimesat sys_futimesat_time32
267267
256 n32 newfstatat sys_newfstatat
268268
257 n32 unlinkat sys_unlinkat
269269
258 n32 renameat sys_renameat
@@ -272,8 +272,8 @@
272272
261 n32 readlinkat sys_readlinkat
273273
262 n32 fchmodat sys_fchmodat
274274
263 n32 faccessat sys_faccessat
275-
264 n32 pselect6 compat_sys_pselect6
276-
265 n32 ppoll compat_sys_ppoll
275+
264 n32 pselect6 compat_sys_pselect6_time32
276+
265 n32 ppoll compat_sys_ppoll_time32
277277
266 n32 unshare sys_unshare
278278
267 n32 splice sys_splice
279279
268 n32 sync_file_range sys_sync_file_range
@@ -287,14 +287,14 @@
287287
276 n32 epoll_pwait compat_sys_epoll_pwait
288288
277 n32 ioprio_set sys_ioprio_set
289289
278 n32 ioprio_get sys_ioprio_get
290-
279 n32 utimensat compat_sys_utimensat
290+
279 n32 utimensat sys_utimensat_time32
291291
280 n32 signalfd compat_sys_signalfd
292292
281 n32 timerfd sys_ni_syscall
293293
282 n32 eventfd sys_eventfd
294294
283 n32 fallocate sys_fallocate
295295
284 n32 timerfd_create sys_timerfd_create
296-
285 n32 timerfd_gettime compat_sys_timerfd_gettime
297-
286 n32 timerfd_settime compat_sys_timerfd_settime
296+
285 n32 timerfd_gettime sys_timerfd_gettime32
297+
286 n32 timerfd_settime sys_timerfd_settime32
298298
287 n32 signalfd4 compat_sys_signalfd4
299299
288 n32 eventfd2 sys_eventfd2
300300
289 n32 epoll_create1 sys_epoll_create1
@@ -306,14 +306,14 @@
306306
295 n32 rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo
307307
296 n32 perf_event_open sys_perf_event_open
308308
297 n32 accept4 sys_accept4
309-
298 n32 recvmmsg compat_sys_recvmmsg
309+
298 n32 recvmmsg compat_sys_recvmmsg_time32
310310
299 n32 getdents64 sys_getdents64
311311
300 n32 fanotify_init sys_fanotify_init
312312
301 n32 fanotify_mark sys_fanotify_mark
313313
302 n32 prlimit64 sys_prlimit64
314314
303 n32 name_to_handle_at sys_name_to_handle_at
315315
304 n32 open_by_handle_at sys_open_by_handle_at
316-
305 n32 clock_adjtime compat_sys_clock_adjtime
316+
305 n32 clock_adjtime sys_clock_adjtime32
317317
306 n32 syncfs sys_syncfs
318318
307 n32 sendmmsg compat_sys_sendmmsg
319319
308 n32 setns sys_setns

0 commit comments

Comments
 (0)