git: 06759303ec0f - main - freebsd32: aio_cancel takes a struct aiocb32

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=06759303ec0fbb80aef3225f454a4bdef37b5304

commit 06759303ec0fbb80aef3225f454a4bdef37b5304
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-11-22 22:36:55 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-11-22 22:36:55 +0000

    freebsd32: aio_cancel takes a struct aiocb32
    
    Strictly speaking, it takes a virtual address and doesn't touch the
    object directly, but this is consistant with other aio_*() syscalls.
    
    Reviewed by:    kib
---
 sys/compat/freebsd32/freebsd32_systrace_args.c | 4 ++--
 sys/compat/freebsd32/syscalls.master           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index fb52e939ef79..23af58fe1ffa 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -1481,7 +1481,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 316: {
 		struct aio_cancel_args *p = params;
 		iarg[0] = p->fd; /* int */
-		uarg[1] = (intptr_t)p->aiocbp; /* struct aiocb * */
+		uarg[1] = (intptr_t)p->aiocbp; /* struct aiocb32 * */
 		*n_args = 2;
 		break;
 	}
@@ -5816,7 +5816,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "int";
 			break;
 		case 1:
-			p = "userland struct aiocb *";
+			p = "userland struct aiocb32 *";
 			break;
 		default:
 			break;
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index cf9f562f88fc..2afc453783cf 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -598,7 +598,7 @@
 				    uint32_t * aiocbp, int nent, \
 				    const struct timespec32 *timeout); }
 316	AUE_AIO_CANCEL	NOPROTO	{ int aio_cancel(int fd, \
-				    struct aiocb *aiocbp); }
+				    struct aiocb32 *aiocbp); }
 317	AUE_AIO_ERROR	STD	{ int freebsd32_aio_error( \
 				    struct aiocb32 *aiocbp); }
 318	AUE_AIO_READ	COMPAT6	{ int freebsd32_aio_read( \