Clang-tidy fixes

8 files changed, 89 insertions, 128 deletions

diff --git a/include/arch/x86_64/asm-generic/errno.h b/include/arch/x86_64/asm-generic/errno.h
index 48c02e75..374c95d9 100644
--- a/include/arch/x86_64/asm-generic/errno.h
+++ b/include/arch/x86_64/asm-generic/errno.h
@@ -39,47 +39,47 @@
 
 #define EDEADLOCK EDEADLK
 
-#define EBFONT		59 /* Bad font file format */
-#define ENOSTR		60 /* Device not a stream */
-#define ENODATA		61 /* No data available */
-#define ETIME		62 /* Timer expired */
-#define ENOSR		63 /* Out of streams resources */
-#define ENONET		64 /* Machine is not on the network */
-#define ENOPKG		65 /* Package not installed */
-#define EREMOTE		66 /* Object is remote */
-#define ENOLINK		67 /* Link has been severed */
-#define EADV		68 /* Advertise error */
-#define ESRMNT		69 /* Srmount error */
-#define ECOMM		70 /* Communication error on send */
-#define EPROTO		71 /* Protocol error */
-#define EMULTIHOP	72 /* Multihop attempted */
-#define EDOTDOT		73 /* RFS specific error */
-#define EBADMSG		74 /* Not a data message */
-#define EOVERFLOW	75 /* Value too large for defined data type */
-#define ENOTUNIQ	76 /* Name not unique on network */
-#define EBADFD		77 /* File descriptor in bad state */
-#define EREMCHG		78 /* Remote address changed */
-#define ELIBACC		79 /* Can not access a needed shared library */
-#define ELIBBAD		80 /* Accessing a corrupted shared library */
-#define ELIBSCN		81 /* .lib section in a.out corrupted */
-#define ELIBMAX		82 /* Attempting to link in too many shared libraries */
-#define ELIBEXEC	83 /* Cannot exec a shared library directly */
-#define EILSEQ		84 /* Illegal byte sequence */
-#define ERESTART	85 /* Interrupted system call should be restarted */
-#define ESTRPIPE	86 /* Streams pipe error */
-#define EUSERS		87 /* Too many users */
-#define ENOTSOCK	88 /* Socket operation on non-socket */
-#define EDESTADDRREQ	89 /* Destination address required */
-#define EMSGSIZE	90 /* Message too long */
-#define EPROTOTYPE	91 /* Protocol wrong type for socket */
-#define ENOPROTOOPT	92 /* Protocol not available */
-#define EPROTONOSUPPORT 93 /* Protocol not supported */
-#define ESOCKTNOSUPPORT 94 /* Socket type not supported */
-#define EOPNOTSUPP	95 /* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT	96 /* Protocol family not supported */
-#define EAFNOSUPPORT	97 /* Address family not supported by protocol */
-#define EADDRINUSE	98 /* Address already in use */
-#define EADDRNOTAVAIL	99 /* Cannot assign requested address */
+#define EBFONT		59  /* Bad font file format */
+#define ENOSTR		60  /* Device not a stream */
+#define ENODATA		61  /* No data available */
+#define ETIME		62  /* Timer expired */
+#define ENOSR		63  /* Out of streams resources */
+#define ENONET		64  /* Machine is not on the network */
+#define ENOPKG		65  /* Package not installed */
+#define EREMOTE		66  /* Object is remote */
+#define ENOLINK		67  /* Link has been severed */
+#define EADV		68  /* Advertise error */
+#define ESRMNT		69  /* Srmount error */
+#define ECOMM		70  /* Communication error on send */
+#define EPROTO		71  /* Protocol error */
+#define EMULTIHOP	72  /* Multihop attempted */
+#define EDOTDOT		73  /* RFS specific error */
+#define EBADMSG		74  /* Not a data message */
+#define EOVERFLOW	75  /* Value too large for defined data type */
+#define ENOTUNIQ	76  /* Name not unique on network */
+#define EBADFD		77  /* File descriptor in bad state */
+#define EREMCHG		78  /* Remote address changed */
+#define ELIBACC		79  /* Can not access a needed shared library */
+#define ELIBBAD		80  /* Accessing a corrupted shared library */
+#define ELIBSCN		81  /* .lib section in a.out corrupted */
+#define ELIBMAX		82  /* Attempting to link in too many shared libraries */
+#define ELIBEXEC	83  /* Cannot exec a shared library directly */
+#define EILSEQ		84  /* Illegal byte sequence */
+#define ERESTART	85  /* Interrupted system call should be restarted */
+#define ESTRPIPE	86  /* Streams pipe error */
+#define EUSERS		87  /* Too many users */
+#define ENOTSOCK	88  /* Socket operation on non-socket */
+#define EDESTADDRREQ	89  /* Destination address required */
+#define EMSGSIZE	90  /* Message too long */
+#define EPROTOTYPE	91  /* Protocol wrong type for socket */
+#define ENOPROTOOPT	92  /* Protocol not available */
+#define EPROTONOSUPPORT 93  /* Protocol not supported */
+#define ESOCKTNOSUPPORT 94  /* Socket type not supported */
+#define EOPNOTSUPP	95  /* Operation not supported on transport endpoint */
+#define EPFNOSUPPORT	96  /* Protocol family not supported */
+#define EAFNOSUPPORT	97  /* Address family not supported by protocol */
+#define EADDRINUSE	98  /* Address already in use */
+#define EADDRNOTAVAIL	99  /* Cannot assign requested address */
 #define ENETDOWN	100 /* Network is down */
 #define ENETUNREACH	101 /* Network is unreachable */
 #define ENETRESET	102 /* Network dropped connection because of reset */
diff --git a/include/arch/x86_64/asm-generic/ioctl.h b/include/arch/x86_64/asm-generic/ioctl.h
index a512641b..252a73bc 100644
--- a/include/arch/x86_64/asm-generic/ioctl.h
+++ b/include/arch/x86_64/asm-generic/ioctl.h
@@ -66,9 +66,8 @@
 #define _IOC_READ 2U
 #endif
 
-#define _IOC(dir, type, nr, size)                                \
-	(((dir) << _IOC_DIRSHIFT) | ((type) << _IOC_TYPESHIFT) | \
-	 ((nr) << _IOC_NRSHIFT) | ((size) << _IOC_SIZESHIFT))
+#define _IOC(dir, type, nr, size) \
+	(((dir) << _IOC_DIRSHIFT) | ((type) << _IOC_TYPESHIFT) | ((nr) << _IOC_NRSHIFT) | ((size) << _IOC_SIZESHIFT))
 
 #define _IOC_TYPECHECK(t) (sizeof(t))
 
@@ -78,19 +77,13 @@
  * NOTE: _IOW means userland is writing and kernel is reading. _IOR
  * means userland is reading and kernel is writing.
  */
-#define _IO(type, nr) _IOC(_IOC_NONE, (type), (nr), 0)
-#define _IOR(type, nr, argtype) \
-	_IOC(_IOC_READ, (type), (nr), (_IOC_TYPECHECK(argtype)))
-#define _IOW(type, nr, argtype) \
-	_IOC(_IOC_WRITE, (type), (nr), (_IOC_TYPECHECK(argtype)))
-#define _IOWR(type, nr, argtype) \
-	_IOC(_IOC_READ | _IOC_WRITE, (type), (nr), (_IOC_TYPECHECK(argtype)))
-#define _IOR_BAD(type, nr, argtype) \
-	_IOC(_IOC_READ, (type), (nr), sizeof(argtype))
-#define _IOW_BAD(type, nr, argtype) \
-	_IOC(_IOC_WRITE, (type), (nr), sizeof(argtype))
-#define _IOWR_BAD(type, nr, argtype) \
-	_IOC(_IOC_READ | _IOC_WRITE, (type), (nr), sizeof(argtype))
+#define _IO(type, nr)		     _IOC(_IOC_NONE, (type), (nr), 0)
+#define _IOR(type, nr, argtype)	     _IOC(_IOC_READ, (type), (nr), (_IOC_TYPECHECK(argtype)))
+#define _IOW(type, nr, argtype)	     _IOC(_IOC_WRITE, (type), (nr), (_IOC_TYPECHECK(argtype)))
+#define _IOWR(type, nr, argtype)     _IOC(_IOC_READ | _IOC_WRITE, (type), (nr), (_IOC_TYPECHECK(argtype)))
+#define _IOR_BAD(type, nr, argtype)  _IOC(_IOC_READ, (type), (nr), sizeof(argtype))
+#define _IOW_BAD(type, nr, argtype)  _IOC(_IOC_WRITE, (type), (nr), sizeof(argtype))
+#define _IOWR_BAD(type, nr, argtype) _IOC(_IOC_READ | _IOC_WRITE, (type), (nr), sizeof(argtype))
 
 /* used to decode ioctl numbers.. */
 #define _IOC_DIR(nr)  (((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
diff --git a/include/arch/x86_64/asm-generic/ioctls.h b/include/arch/x86_64/asm-generic/ioctls.h
index e7b4519d..3351185d 100644
--- a/include/arch/x86_64/asm-generic/ioctls.h
+++ b/include/arch/x86_64/asm-generic/ioctls.h
@@ -66,9 +66,8 @@
 #ifndef TIOCSRS485
 #define TIOCSRS485 0x542F
 #endif
-#define TIOCGPTN \
-	_IOR('T', 0x30, unsigned int)	/* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */
+#define TIOCGPTN   _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
+#define TIOCSPTLCK _IOW('T', 0x31, int)		 /* Lock/unlock Pty */
 #define TIOCGDEV                                                    \
 	_IOR('T', 0x32, unsigned int) /* Get primary device node of \
 					 /dev/console */
diff --git a/include/arch/x86_64/asm-generic/mman-common.h b/include/arch/x86_64/asm-generic/mman-common.h
index cbcba366..f571d971 100644
--- a/include/arch/x86_64/asm-generic/mman-common.h
+++ b/include/arch/x86_64/asm-generic/mman-common.h
@@ -14,11 +14,10 @@
 /*			0x10		   reserved for arch-specific use */
 /*			0x20		   reserved for arch-specific use */
 #define PROT_NONE 0x0 /* page can not be accessed */
-#define PROT_GROWSDOWN                                                       \
-	0x01000000 /* mprotect flag: extend change to start of growsdown vma \
-		    */
-#define PROT_GROWSUP \
-	0x02000000 /* mprotect flag: extend change to end of growsup vma */
+#define PROT_GROWSDOWN                                                                    \
+	0x01000000		/* mprotect flag: extend change to start of growsdown vma \
+				 */
+#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
 
 /* 0x01 - 0x03 are defined in linux/mman.h */
 #define MAP_TYPE      0x0f /* Mask for type of mapping */
@@ -28,15 +27,14 @@
 /* 0x0100 - 0x4000 flags are defined in asm-generic/mman.h */
 #define MAP_POPULATE 0x008000 /* populate (prefault) pagetables */
 #define MAP_NONBLOCK 0x010000 /* do not block on IO */
-#define MAP_STACK                                                              \
-	0x020000 /* give out an address that is best suited for process/thread \
-		    stacks */
+#define MAP_STACK                                                                          \
+	0x020000	     /* give out an address that is best suited for process/thread \
+				stacks */
 #define MAP_HUGETLB 0x040000 /* create a huge page mapping */
-#define MAP_SYNC                                                    \
-	0x080000 /* perform synchronous page faults for the mapping \
-		  */
-#define MAP_FIXED_NOREPLACE \
-	0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
+#define MAP_SYNC                                                                        \
+	0x080000		     /* perform synchronous page faults for the mapping \
+				      */
+#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
 
 #define MAP_UNINITIALIZED                                \
 	0x4000000 /* For anonymous mmap, memory could be \
diff --git a/include/arch/x86_64/asm-generic/mman.h b/include/arch/x86_64/asm-generic/mman.h
index f4c1b653..a4d89337 100644
--- a/include/arch/x86_64/asm-generic/mman.h
+++ b/include/arch/x86_64/asm-generic/mman.h
@@ -19,9 +19,7 @@
 #define MCL_FUTURE  2 /* lock all future mappings */
 #define MCL_ONFAULT 4 /* lock all pages that are faulted in */
 
-#define SHADOW_STACK_SET_TOKEN \
-	(1ULL << 0) /* Set up a restore token in the shadow stack */
-#define SHADOW_STACK_SET_MARKER \
-	(1ULL << 1) /* Set up a top of stack marker in the shadow stack */
+#define SHADOW_STACK_SET_TOKEN	(1ULL << 0) /* Set up a restore token in the shadow stack */
+#define SHADOW_STACK_SET_MARKER (1ULL << 1) /* Set up a top of stack marker in the shadow stack */
 
 #endif /* __ASM_GENERIC_MMAN_H */
diff --git a/include/arch/x86_64/asm-generic/siginfo.h b/include/arch/x86_64/asm-generic/siginfo.h
index eae3587b..479feb9c 100644
--- a/include/arch/x86_64/asm-generic/siginfo.h
+++ b/include/arch/x86_64/asm-generic/siginfo.h
@@ -45,8 +45,8 @@ union __sifields {
 		__kernel_timer_t _tid; /* timer id */
 		int _overrun;	       /* overrun count */
 		sigval_t _sigval;      /* same as below */
-		int _sys_private; /* Not used by the kernel. Historic leftover.
-				     Always 0. */
+		int _sys_private;      /* Not used by the kernel. Historic leftover.
+					  Always 0. */
 	} _timer;
 
 	/* POSIX.1b signals */
@@ -69,9 +69,7 @@ union __sifields {
 	struct {
 		void *_addr; /* faulting insn/memory ref. */
 
-#define __ADDR_BND_PKEY_PAD                                    \
-	(__alignof__(void *) < sizeof(short) ? sizeof(short) : \
-					       __alignof__(void *))
+#define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? sizeof(short) : __alignof__(void *))
 		union {
 			/* used on alpha and sparc */
 			int _trapno; /* TRAP # which caused the signal */
@@ -331,8 +329,7 @@ typedef struct siginfo {
 #endif
 
 #define SIGEV_MAX_SIZE 64
-#define SIGEV_PAD_SIZE \
-	((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) / sizeof(int))
+#define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE - __ARCH_SIGEV_PREAMBLE_SIZE) / sizeof(int))
 
 typedef struct sigevent {
 	sigval_t sigev_value;
diff --git a/include/arch/x86_64/asm-generic/socket.h b/include/arch/x86_64/asm-generic/socket.h
index fb9a86f9..99cc4305 100644
--- a/include/arch/x86_64/asm-generic/socket.h
+++ b/include/arch/x86_64/asm-generic/socket.h
@@ -159,22 +159,12 @@
 #define SO_RCVTIMEO SO_RCVTIMEO_OLD
 #define SO_SNDTIMEO SO_SNDTIMEO_OLD
 #else
-#define SO_TIMESTAMP                                                    \
-	(sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : \
-						     SO_TIMESTAMP_NEW)
-#define SO_TIMESTAMPNS                                                    \
-	(sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : \
-						     SO_TIMESTAMPNS_NEW)
-#define SO_TIMESTAMPING                                                    \
-	(sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : \
-						     SO_TIMESTAMPING_NEW)
-
-#define SO_RCVTIMEO                                                    \
-	(sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : \
-						     SO_RCVTIMEO_NEW)
-#define SO_SNDTIMEO                                                    \
-	(sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : \
-						     SO_SNDTIMEO_NEW)
+#define SO_TIMESTAMP	(sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)
+#define SO_TIMESTAMPNS	(sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)
+#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)
+
+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)
+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)
 #endif
 
 #define SCM_TIMESTAMP	 SO_TIMESTAMP
diff --git a/include/arch/x86_64/asm-generic/unistd.h b/include/arch/x86_64/asm-generic/unistd.h
index 65a53249..c4e26715 100644
--- a/include/arch/x86_64/asm-generic/unistd.h
+++ b/include/arch/x86_64/asm-generic/unistd.h
@@ -128,14 +128,11 @@ __SYSCALL(__NR_nfsservctl, sys_ni_syscall)
 #define __NR3264_statfs 43
 __SC_COMP_3264(__NR3264_statfs, sys_statfs64, sys_statfs, compat_sys_statfs64)
 #define __NR3264_fstatfs 44
-__SC_COMP_3264(__NR3264_fstatfs, sys_fstatfs64, sys_fstatfs,
-	       compat_sys_fstatfs64)
+__SC_COMP_3264(__NR3264_fstatfs, sys_fstatfs64, sys_fstatfs, compat_sys_fstatfs64)
 #define __NR3264_truncate 45
-__SC_COMP_3264(__NR3264_truncate, sys_truncate64, sys_truncate,
-	       compat_sys_truncate64)
+__SC_COMP_3264(__NR3264_truncate, sys_truncate64, sys_truncate, compat_sys_truncate64)
 #define __NR3264_ftruncate 46
-__SC_COMP_3264(__NR3264_ftruncate, sys_ftruncate64, sys_ftruncate,
-	       compat_sys_ftruncate64)
+__SC_COMP_3264(__NR3264_ftruncate, sys_ftruncate64, sys_ftruncate, compat_sys_ftruncate64)
 #define __NR_fallocate 47
 __SC_COMP(__NR_fallocate, sys_fallocate, compat_sys_fallocate)
 #define __NR_faccessat 48
@@ -189,8 +186,7 @@ __SYSCALL(__NR3264_sendfile, sys_sendfile64)
 
 #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_pselect6 72
-__SC_COMP_3264(__NR_pselect6, sys_pselect6_time32, sys_pselect6,
-	       compat_sys_pselect6_time32)
+__SC_COMP_3264(__NR_pselect6, sys_pselect6_time32, sys_pselect6, compat_sys_pselect6_time32)
 #define __NR_ppoll 73
 __SC_COMP_3264(__NR_ppoll, sys_ppoll_time32, sys_ppoll, compat_sys_ppoll_time32)
 #endif
@@ -222,8 +218,7 @@ __SYSCALL(__NR_fdatasync, sys_fdatasync)
 
 #ifdef __ARCH_WANT_SYNC_FILE_RANGE2
 #define __NR_sync_file_range2 84
-__SC_COMP(__NR_sync_file_range2, sys_sync_file_range2,
-	  compat_sys_sync_file_range2)
+__SC_COMP(__NR_sync_file_range2, sys_sync_file_range2, compat_sys_sync_file_range2)
 #else
 #define __NR_sync_file_range 84
 __SC_COMP(__NR_sync_file_range, sys_sync_file_range, compat_sys_sync_file_range)
@@ -331,11 +326,9 @@ __SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
 #define __NR_sched_getparam 121
 __SYSCALL(__NR_sched_getparam, sys_sched_getparam)
 #define __NR_sched_setaffinity 122
-__SC_COMP(__NR_sched_setaffinity, sys_sched_setaffinity,
-	  compat_sys_sched_setaffinity)
+__SC_COMP(__NR_sched_setaffinity, sys_sched_setaffinity, compat_sys_sched_setaffinity)
 #define __NR_sched_getaffinity 123
-__SC_COMP(__NR_sched_getaffinity, sys_sched_getaffinity,
-	  compat_sys_sched_getaffinity)
+__SC_COMP(__NR_sched_getaffinity, sys_sched_getaffinity, compat_sys_sched_getaffinity)
 #define __NR_sched_yield 124
 __SYSCALL(__NR_sched_yield, sys_sched_yield)
 #define __NR_sched_get_priority_max 125
@@ -345,8 +338,7 @@ __SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
 
 #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_sched_rr_get_interval 127
-__SC_3264(__NR_sched_rr_get_interval, sys_sched_rr_get_interval_time32,
-	  sys_sched_rr_get_interval)
+__SC_3264(__NR_sched_rr_get_interval, sys_sched_rr_get_interval_time32, sys_sched_rr_get_interval)
 #endif
 
 #define __NR_restart_syscall 128
@@ -370,8 +362,7 @@ __SC_COMP(__NR_rt_sigpending, sys_rt_sigpending, compat_sys_rt_sigpending)
 
 #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_rt_sigtimedwait 137
-__SC_COMP_3264(__NR_rt_sigtimedwait, sys_rt_sigtimedwait_time32,
-	       sys_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time32)
+__SC_COMP_3264(__NR_rt_sigtimedwait, sys_rt_sigtimedwait_time32, sys_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time32)
 #endif
 
 #define __NR_rt_sigqueueinfo 138
@@ -601,8 +592,7 @@ __SYSCALL(__NR_move_pages, sys_move_pages)
 #endif
 
 #define __NR_rt_tgsigqueueinfo 240
-__SC_COMP(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo,
-	  compat_sys_rt_tgsigqueueinfo)
+__SC_COMP(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo, compat_sys_rt_tgsigqueueinfo)
 #define __NR_perf_event_open 241
 __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 #define __NR_accept4 242
@@ -610,8 +600,7 @@ __SYSCALL(__NR_accept4, sys_accept4)
 
 #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_recvmmsg 243
-__SC_COMP_3264(__NR_recvmmsg, sys_recvmmsg_time32, sys_recvmmsg,
-	       compat_sys_recvmmsg_time32)
+__SC_COMP_3264(__NR_recvmmsg, sys_recvmmsg_time32, sys_recvmmsg, compat_sys_recvmmsg_time32)
 #endif
 
 /*
@@ -694,8 +683,7 @@ __SYSCALL(__NR_statx, sys_statx)
 
 #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32
 #define __NR_io_pgetevents 292
-__SC_COMP_3264(__NR_io_pgetevents, sys_io_pgetevents_time32, sys_io_pgetevents,
-	       compat_sys_io_pgetevents)
+__SC_COMP_3264(__NR_io_pgetevents, sys_io_pgetevents_time32, sys_io_pgetevents, compat_sys_io_pgetevents)
 #endif
 
 #define __NR_rseq 293
@@ -731,8 +719,7 @@ __SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64)
 #define __NR_ppoll_time64 414
 __SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64)
 #define __NR_io_pgetevents_time64 416
-__SC_COMP(__NR_io_pgetevents_time64, sys_io_pgetevents,
-	  compat_sys_io_pgetevents_time64)
+__SC_COMP(__NR_io_pgetevents_time64, sys_io_pgetevents, compat_sys_io_pgetevents_time64)
 #define __NR_recvmmsg_time64 417
 __SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64)
 #define __NR_mq_timedsend_time64 418
@@ -742,8 +729,7 @@ __SYSCALL(__NR_mq_timedreceive_time64, sys_mq_timedreceive)
 #define __NR_semtimedop_time64 420
 __SYSCALL(__NR_semtimedop_time64, sys_semtimedop)
 #define __NR_rt_sigtimedwait_time64 421
-__SC_COMP(__NR_rt_sigtimedwait_time64, sys_rt_sigtimedwait,
-	  compat_sys_rt_sigtimedwait_time64)
+__SC_COMP(__NR_rt_sigtimedwait_time64, sys_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time64)
 #define __NR_futex_time64 422
 __SYSCALL(__NR_futex_time64, sys_futex)
 #define __NR_sched_rr_get_interval_time64 423