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.
Showing the changes to include/uapi (1 of 26 files). Show all
Unified · Split
| @@ -39,7 +39,7 @@ __SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit) · 38 unmodified lines | |||
| 39 | #define __NR_io_cancel 3 | 39 | #define __NR_io_cancel 3 |
| 40 | __SYSCALL(__NR_io_cancel, sys_io_cancel) | 40 | __SYSCALL(__NR_io_cancel, sys_io_cancel) |
| 41 | #define __NR_io_getevents 4 | 41 | #define __NR_io_getevents 4 |
| 42 | __SC_COMP(__NR_io_getevents, sys_io_getevents, compat_sys_io_getevents) | 42 | __SC_COMP(__NR_io_getevents, sys_io_getevents, sys_io_getevents_time32) |
| 43 | 43 | ||
| 44 | /* fs/xattr.c */ | 44 | /* fs/xattr.c */ |
| 45 | #define __NR_setxattr 5 | 45 | #define __NR_setxattr 5 |
| @@ -223,9 +223,9 @@ __SYSCALL(__NR3264_sendfile, sys_sendfile64) · 177 unmodified lines | |||
| 223 | 223 | ||
| 224 | /* fs/select.c */ | 224 | /* fs/select.c */ |
| 225 | #define __NR_pselect6 72 | 225 | #define __NR_pselect6 72 |
| 226 | __SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6) | 226 | __SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6_time32) |
| 227 | #define __NR_ppoll 73 | 227 | #define __NR_ppoll 73 |
| 228 | __SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll) | 228 | __SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll_time32) |
| 229 | 229 | ||
| 230 | /* fs/signalfd.c */ | 230 | /* fs/signalfd.c */ |
| 231 | #define __NR_signalfd4 74 | 231 | #define __NR_signalfd4 74 |
| @@ -271,14 +271,14 @@ __SC_COMP(__NR_sync_file_range, sys_sync_file_range, \ · 39 unmodified lines | |||
| 271 | __SYSCALL(__NR_timerfd_create, sys_timerfd_create) | 271 | __SYSCALL(__NR_timerfd_create, sys_timerfd_create) |
| 272 | #define __NR_timerfd_settime 86 | 272 | #define __NR_timerfd_settime 86 |
| 273 | __SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \ | 273 | __SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \ |
| 274 | compat_sys_timerfd_settime) | 274 | sys_timerfd_settime32) |
| 275 | #define __NR_timerfd_gettime 87 | 275 | #define __NR_timerfd_gettime 87 |
| 276 | __SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \ | 276 | __SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \ |
| 277 | compat_sys_timerfd_gettime) | 277 | sys_timerfd_gettime32) |
| 278 | 278 | ||
| 279 | /* fs/utimes.c */ | 279 | /* fs/utimes.c */ |
| 280 | #define __NR_utimensat 88 | 280 | #define __NR_utimensat 88 |
| 281 | __SC_COMP(__NR_utimensat, sys_utimensat, compat_sys_utimensat) | 281 | __SC_COMP(__NR_utimensat, sys_utimensat, sys_utimensat_time32) |
| 282 | 282 | ||
| 283 | /* kernel/acct.c */ | 283 | /* kernel/acct.c */ |
| 284 | #define __NR_acct 89 | 284 | #define __NR_acct 89 |
| @@ -310,7 +310,7 @@ __SYSCALL(__NR_unshare, sys_unshare) · 25 unmodified lines | |||
| 310 | 310 | ||
| 311 | /* kernel/futex.c */ | 311 | /* kernel/futex.c */ |
| 312 | #define __NR_futex 98 | 312 | #define __NR_futex 98 |
| 313 | __SC_COMP(__NR_futex, sys_futex, compat_sys_futex) | 313 | __SC_COMP(__NR_futex, sys_futex, sys_futex_time32) |
| 314 | #define __NR_set_robust_list 99 | 314 | #define __NR_set_robust_list 99 |
| 315 | __SC_COMP(__NR_set_robust_list, sys_set_robust_list, \ | 315 | __SC_COMP(__NR_set_robust_list, sys_set_robust_list, \ |
| 316 | compat_sys_set_robust_list) | 316 | compat_sys_set_robust_list) |
| @@ -320,7 +320,7 @@ __SC_COMP(__NR_get_robust_list, sys_get_robust_list, \ · 3 unmodified lines | |||
| 320 | 320 | ||
| 321 | /* kernel/hrtimer.c */ | 321 | /* kernel/hrtimer.c */ |
| 322 | #define __NR_nanosleep 101 | 322 | #define __NR_nanosleep 101 |
| 323 | __SC_COMP(__NR_nanosleep, sys_nanosleep, compat_sys_nanosleep) | 323 | __SC_COMP(__NR_nanosleep, sys_nanosleep, sys_nanosleep_time32) |
| 324 | 324 | ||
| 325 | /* kernel/itimer.c */ | 325 | /* kernel/itimer.c */ |
| 326 | #define __NR_getitimer 102 | 326 | #define __NR_getitimer 102 |
| @@ -342,22 +342,22 @@ __SYSCALL(__NR_delete_module, sys_delete_module) · 15 unmodified lines | |||
| 342 | #define __NR_timer_create 107 | 342 | #define __NR_timer_create 107 |
| 343 | __SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create) | 343 | __SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create) |
| 344 | #define __NR_timer_gettime 108 | 344 | #define __NR_timer_gettime 108 |
| 345 | __SC_COMP(__NR_timer_gettime, sys_timer_gettime, compat_sys_timer_gettime) | 345 | __SC_COMP(__NR_timer_gettime, sys_timer_gettime, sys_timer_gettime32) |
| 346 | #define __NR_timer_getoverrun 109 | 346 | #define __NR_timer_getoverrun 109 |
| 347 | __SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun) | 347 | __SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun) |
| 348 | #define __NR_timer_settime 110 | 348 | #define __NR_timer_settime 110 |
| 349 | __SC_COMP(__NR_timer_settime, sys_timer_settime, compat_sys_timer_settime) | 349 | __SC_COMP(__NR_timer_settime, sys_timer_settime, sys_timer_settime32) |
| 350 | #define __NR_timer_delete 111 | 350 | #define __NR_timer_delete 111 |
| 351 | __SYSCALL(__NR_timer_delete, sys_timer_delete) | 351 | __SYSCALL(__NR_timer_delete, sys_timer_delete) |
| 352 | #define __NR_clock_settime 112 | 352 | #define __NR_clock_settime 112 |
| 353 | __SC_COMP(__NR_clock_settime, sys_clock_settime, compat_sys_clock_settime) | 353 | __SC_COMP(__NR_clock_settime, sys_clock_settime, sys_clock_settime32) |
| 354 | #define __NR_clock_gettime 113 | 354 | #define __NR_clock_gettime 113 |
| 355 | __SC_COMP(__NR_clock_gettime, sys_clock_gettime, compat_sys_clock_gettime) | 355 | __SC_COMP(__NR_clock_gettime, sys_clock_gettime, sys_clock_gettime32) |
| 356 | #define __NR_clock_getres 114 | 356 | #define __NR_clock_getres 114 |
| 357 | __SC_COMP(__NR_clock_getres, sys_clock_getres, compat_sys_clock_getres) | 357 | __SC_COMP(__NR_clock_getres, sys_clock_getres, sys_clock_getres_time32) |
| 358 | #define __NR_clock_nanosleep 115 | 358 | #define __NR_clock_nanosleep 115 |
| 359 | __SC_COMP(__NR_clock_nanosleep, sys_clock_nanosleep, \ | 359 | __SC_COMP(__NR_clock_nanosleep, sys_clock_nanosleep, \ |
| 360 | compat_sys_clock_nanosleep) | 360 | sys_clock_nanosleep_time32) |
| 361 | 361 | ||
| 362 | /* kernel/printk.c */ | 362 | /* kernel/printk.c */ |
| 363 | #define __NR_syslog 116 | 363 | #define __NR_syslog 116 |
| @@ -390,7 +390,7 @@ __SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max) · 26 unmodified lines | |||
| 390 | __SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min) | 390 | __SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min) |
| 391 | #define __NR_sched_rr_get_interval 127 | 391 | #define __NR_sched_rr_get_interval 127 |
| 392 | __SC_COMP(__NR_sched_rr_get_interval, sys_sched_rr_get_interval, \ | 392 | __SC_COMP(__NR_sched_rr_get_interval, sys_sched_rr_get_interval, \ |
| 393 | compat_sys_sched_rr_get_interval) | 393 | sys_sched_rr_get_interval_time32) |
| 394 | 394 | ||
| 395 | /* kernel/signal.c */ | 395 | /* kernel/signal.c */ |
| 396 | #define __NR_restart_syscall 128 | 396 | #define __NR_restart_syscall 128 |
| @@ -413,7 +413,7 @@ __SC_COMP(__NR_rt_sigprocmask, sys_rt_sigprocmask, compat_sys_rt_sigprocmask) · 16 unmodified lines | |||
| 413 | __SC_COMP(__NR_rt_sigpending, sys_rt_sigpending, compat_sys_rt_sigpending) | 413 | __SC_COMP(__NR_rt_sigpending, sys_rt_sigpending, compat_sys_rt_sigpending) |
| 414 | #define __NR_rt_sigtimedwait 137 | 414 | #define __NR_rt_sigtimedwait 137 |
| 415 | __SC_COMP(__NR_rt_sigtimedwait, sys_rt_sigtimedwait, \ | 415 | __SC_COMP(__NR_rt_sigtimedwait, sys_rt_sigtimedwait, \ |
| 416 | compat_sys_rt_sigtimedwait) | 416 | compat_sys_rt_sigtimedwait_time32) |
| 417 | #define __NR_rt_sigqueueinfo 138 | 417 | #define __NR_rt_sigqueueinfo 138 |
| 418 | __SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \ | 418 | __SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \ |
| 419 | compat_sys_rt_sigqueueinfo) | 419 | compat_sys_rt_sigqueueinfo) |
| @@ -486,7 +486,7 @@ __SC_COMP(__NR_gettimeofday, sys_gettimeofday, compat_sys_gettimeofday) · 66 unmodified lines | |||
| 486 | #define __NR_settimeofday 170 | 486 | #define __NR_settimeofday 170 |
| 487 | __SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday) | 487 | __SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday) |
| 488 | #define __NR_adjtimex 171 | 488 | #define __NR_adjtimex 171 |
| 489 | __SC_COMP(__NR_adjtimex, sys_adjtimex, compat_sys_adjtimex) | 489 | __SC_COMP(__NR_adjtimex, sys_adjtimex, sys_adjtimex_time32) |
| 490 | 490 | ||
| 491 | /* kernel/timer.c */ | 491 | /* kernel/timer.c */ |
| 492 | #define __NR_getpid 172 | 492 | #define __NR_getpid 172 |
| @@ -512,10 +512,10 @@ __SC_COMP(__NR_mq_open, sys_mq_open, compat_sys_mq_open) · 19 unmodified lines | |||
| 512 | #define __NR_mq_unlink 181 | 512 | #define __NR_mq_unlink 181 |
| 513 | __SYSCALL(__NR_mq_unlink, sys_mq_unlink) | 513 | __SYSCALL(__NR_mq_unlink, sys_mq_unlink) |
| 514 | #define __NR_mq_timedsend 182 | 514 | #define __NR_mq_timedsend 182 |
| 515 | __SC_COMP(__NR_mq_timedsend, sys_mq_timedsend, compat_sys_mq_timedsend) | 515 | __SC_COMP(__NR_mq_timedsend, sys_mq_timedsend, sys_mq_timedsend_time32) |
| 516 | #define __NR_mq_timedreceive 183 | 516 | #define __NR_mq_timedreceive 183 |
| 517 | __SC_COMP(__NR_mq_timedreceive, sys_mq_timedreceive, \ | 517 | __SC_COMP(__NR_mq_timedreceive, sys_mq_timedreceive, \ |
| 518 | compat_sys_mq_timedreceive) | 518 | sys_mq_timedreceive_time32) |
| 519 | #define __NR_mq_notify 184 | 519 | #define __NR_mq_notify 184 |
| 520 | __SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify) | 520 | __SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify) |
| 521 | #define __NR_mq_getsetattr 185 | 521 | #define __NR_mq_getsetattr 185 |
| @@ -537,7 +537,7 @@ __SYSCALL(__NR_semget, sys_semget) · 15 unmodified lines | |||
| 537 | #define __NR_semctl 191 | 537 | #define __NR_semctl 191 |
| 538 | __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl) | 538 | __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl) |
| 539 | #define __NR_semtimedop 192 | 539 | #define __NR_semtimedop 192 |
| 540 | __SC_COMP(__NR_semtimedop, sys_semtimedop, compat_sys_semtimedop) | 540 | __SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32) |
| 541 | #define __NR_semop 193 | 541 | #define __NR_semop 193 |
| 542 | __SYSCALL(__NR_semop, sys_semop) | 542 | __SYSCALL(__NR_semop, sys_semop) |
| 543 | 543 | ||
| @@ -659,7 +659,7 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open) · 115 unmodified lines | |||
| 659 | #define __NR_accept4 242 | 659 | #define __NR_accept4 242 |
| 660 | __SYSCALL(__NR_accept4, sys_accept4) | 660 | __SYSCALL(__NR_accept4, sys_accept4) |
| 661 | #define __NR_recvmmsg 243 | 661 | #define __NR_recvmmsg 243 |
| 662 | __SC_COMP(__NR_recvmmsg, sys_recvmmsg, compat_sys_recvmmsg) | 662 | __SC_COMP(__NR_recvmmsg, sys_recvmmsg, compat_sys_recvmmsg_time32) |
| 663 | 663 | ||
| 664 | /* | 664 | /* |
| 665 | * Architectures may provide up to 16 syscalls of their own | 665 | * Architectures may provide up to 16 syscalls of their own |
| @@ -681,7 +681,7 @@ __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at) · 15 unmodified lines | |||
| 681 | __SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \ | 681 | __SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \ |
| 682 | compat_sys_open_by_handle_at) | 682 | compat_sys_open_by_handle_at) |
| 683 | #define __NR_clock_adjtime 266 | 683 | #define __NR_clock_adjtime 266 |
| 684 | __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime) | 684 | __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, sys_clock_adjtime32) |
| 685 | #define __NR_syncfs 267 | 685 | #define __NR_syncfs 267 |
| 686 | __SYSCALL(__NR_syncfs, sys_syncfs) | 686 | __SYSCALL(__NR_syncfs, sys_syncfs) |
| 687 | #define __NR_setns 268 | 687 | #define __NR_setns 268 |