Revert "syscallarg_t: Add a type for system call arguments"

Missed issues in truss on at least armv7 and powerpcspe need to be
resolved before recommit.

This reverts commit 3889fb8af0b611e3126dc250ebffb01805152104.
This reverts commit 1544e0f5d1f1e3b8c10a64cb899a936976ca7ea4.

2 files changed, 58 insertions, 58 deletions

diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index 29dd536bb1e5..5f664cf787c2 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -23,8 +23,8 @@ struct proc;
 
 struct thread;
 
-#define	PAD_(t)	(sizeof(syscallarg_t) <= sizeof(t) ? \
-		0 : sizeof(syscallarg_t) - sizeof(t))
+#define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
+		0 : sizeof(register_t) - sizeof(t))
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define	PADL_(t)	0
@@ -106,7 +106,7 @@ struct linux_getcwd_args {
 	char bufsize_l_[PADL_(l_ulong)]; l_ulong bufsize; char bufsize_r_[PADR_(l_ulong)];
 };
 struct linux_lookup_dcookie_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_eventfd2_args {
 	char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
@@ -143,10 +143,10 @@ struct linux_inotify_init1_args {
 	char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
 };
 struct linux_inotify_add_watch_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_inotify_rm_watch_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_ioctl_args {
 	char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
@@ -154,10 +154,10 @@ struct linux_ioctl_args {
 	char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)];
 };
 struct linux_ioprio_set_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_ioprio_get_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_mknodat_args {
 	char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@@ -201,7 +201,7 @@ struct linux_mount_args {
 	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
 };
 struct linux_pivot_root_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_statfs_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@@ -252,7 +252,7 @@ struct linux_openat_args {
 	char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)];
 };
 struct linux_vhangup_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_pipe2_args {
 	char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char pipefds_r_[PADR_(l_int *)];
@@ -316,10 +316,10 @@ struct linux_ppoll_args {
 	char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)];
 };
 struct linux_signalfd4_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_vmsplice_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_splice_args {
 	char fd_in_l_[PADL_(int)]; int fd_in; char fd_in_r_[PADR_(int)];
@@ -330,7 +330,7 @@ struct linux_splice_args {
 	char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
 };
 struct linux_tee_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_readlinkat_args {
 	char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@@ -405,7 +405,7 @@ struct linux_set_tid_address_args {
 	char tidptr_l_[PADL_(l_int *)]; l_int * tidptr; char tidptr_r_[PADR_(l_int *)];
 };
 struct linux_unshare_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_sys_futex_args {
 	char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
@@ -438,13 +438,13 @@ struct linux_setitimer_args {
 	char oitv_l_[PADL_(struct l_itimerval *)]; struct l_itimerval * oitv; char oitv_r_[PADR_(struct l_itimerval *)];
 };
 struct linux_kexec_load_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_init_module_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_delete_module_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_timer_create_args {
 	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
@@ -581,7 +581,7 @@ struct linux_rt_sigqueueinfo_args {
 	char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)];
 };
 struct linux_rt_sigreturn_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_getpriority_args {
 	char which_l_[PADL_(l_int)]; l_int which; char which_r_[PADR_(l_int)];
@@ -645,22 +645,22 @@ struct linux_getcpu_args {
 	char cache_l_[PADL_(void *)]; void * cache; char cache_r_[PADR_(void *)];
 };
 struct linux_adjtimex_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_getpid_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_getppid_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_getuid_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_getgid_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_gettid_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_sysinfo_args {
 	char info_l_[PADL_(struct l_sysinfo *)]; struct l_sysinfo * info; char info_r_[PADR_(struct l_sysinfo *)];
@@ -731,7 +731,7 @@ struct linux_semctl_args {
 	char arg_l_[PADL_(union l_semun)]; union l_semun arg; char arg_r_[PADR_(union l_semun)];
 };
 struct linux_semtimedop_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_semop_args {
 	char semid_l_[PADL_(l_int)]; l_int semid; char semid_r_[PADR_(l_int)];
@@ -851,13 +851,13 @@ struct linux_mremap_args {
 	char new_addr_l_[PADL_(l_ulong)]; l_ulong new_addr; char new_addr_r_[PADR_(l_ulong)];
 };
 struct linux_add_key_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_request_key_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_keyctl_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_clone_args {
 	char flags_l_[PADL_(l_ulong)]; l_ulong flags; char flags_r_[PADR_(l_ulong)];
@@ -886,7 +886,7 @@ struct linux_fadvise64_args {
 	char advice_l_[PADL_(l_int)]; l_int advice; char advice_r_[PADR_(l_int)];
 };
 struct linux_swapoff_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_mprotect_args {
 	char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)];
@@ -909,22 +909,22 @@ struct linux_madvise_args {
 	char behav_l_[PADL_(l_int)]; l_int behav; char behav_r_[PADR_(l_int)];
 };
 struct linux_remap_file_pages_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_mbind_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_get_mempolicy_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_set_mempolicy_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_migrate_pages_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_move_pages_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_rt_tgsigqueueinfo_args {
 	char tgid_l_[PADL_(l_pid_t)]; l_pid_t tgid; char tgid_r_[PADR_(l_pid_t)];
@@ -933,7 +933,7 @@ struct linux_rt_tgsigqueueinfo_args {
 	char uinfo_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * uinfo; char uinfo_r_[PADR_(l_siginfo_t *)];
 };
 struct linux_perf_event_open_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_accept4_args {
 	char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)];
@@ -961,10 +961,10 @@ struct linux_prlimit64_args {
 	char old_l_[PADL_(struct rlimit *)]; struct rlimit * old; char old_r_[PADR_(struct rlimit *)];
 };
 struct linux_fanotify_init_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_fanotify_mark_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_name_to_handle_at_args {
 	char dirfd_l_[PADL_(l_int)]; l_int dirfd; char dirfd_r_[PADR_(l_int)];
@@ -979,7 +979,7 @@ struct linux_open_by_handle_at_args {
 	char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
 };
 struct linux_clock_adjtime_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_syncfs_args {
 	char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
@@ -1123,13 +1123,13 @@ struct linux_statx_args {
 	char statxbuf_l_[PADL_(void *)]; void * statxbuf; char statxbuf_r_[PADR_(void *)];
 };
 struct linux_io_pgetevents_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_rseq_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_kexec_file_load_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_pidfd_send_signal_args {
 	char pidfd_l_[PADL_(l_int)]; l_int pidfd; char pidfd_r_[PADR_(l_int)];
@@ -1138,47 +1138,47 @@ struct linux_pidfd_send_signal_args {
 	char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
 };
 struct linux_io_uring_setup_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_io_uring_enter_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_io_uring_register_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_open_tree_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_move_mount_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_fsopen_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_fsconfig_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_fsmount_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_fspick_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_pidfd_open_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_clone3_args {
 	char uargs_l_[PADL_(struct l_user_clone_args *)]; struct l_user_clone_args * uargs; char uargs_r_[PADR_(struct l_user_clone_args *)];
 	char usize_l_[PADL_(l_size_t)]; l_size_t usize; char usize_r_[PADR_(l_size_t)];
 };
 struct linux_close_range_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_openat2_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_pidfd_getfd_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_faccessat2_args {
 	char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
@@ -1187,13 +1187,13 @@ struct linux_faccessat2_args {
 	char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
 };
 struct linux_process_madvise_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_epoll_pwait2_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 struct linux_mount_setattr_args {
-	syscallarg_t dummy;
+	register_t dummy;
 };
 #define	nosys	linux_nosys
 int	linux_setxattr(struct thread *, struct linux_setxattr_args *);
diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c
index f0faa9f51b74..5228faa77b8c 100644
--- a/sys/arm64/linux/linux_sysent.c
+++ b/sys/arm64/linux/linux_sysent.c
@@ -12,7 +12,7 @@
 #include <arm64/linux/linux.h>
 #include <arm64/linux/linux_proto.h>
 
-#define AS(name) (sizeof(struct name) / sizeof(syscallarg_t))
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
 
 /* The casts are bogus but will do for now. */
 struct sysent linux_sysent[] = {