The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5cd9d254039e06493919b43a1b6ee9939f5c800f
commit 5cd9d254039e06493919b43a1b6ee9939f5c800f Author: John Baldwin <[email protected]> AuthorDate: 2022-04-09 00:25:13 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-09 00:25:13 +0000 aac: Move sge64 declaration into the #ifdef __amd64__ block. --- sys/dev/aac/aac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index c783c390872b..05946414abc6 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -3053,7 +3053,6 @@ aac_ioctl_send_raw_srb(struct aac_softc *sc, caddr_t arg) struct aac_fib *fib; struct aac_srb *srbcmd, *user_srb; struct aac_sg_entry *sge; - struct aac_sg_entry64 *sge64; void *srb_sg_address, *ureply; uint32_t fibsize, srb_sg_bytecount; int error, transfer_data; @@ -3108,7 +3107,6 @@ aac_ioctl_send_raw_srb(struct aac_softc *sc, caddr_t arg) struct aac_sg_entry sg; sge = srbcmd->sg_map.SgEntry; - sge64 = NULL; if ((error = copyin(sge, &sg, sizeof(sg))) != 0) goto out; @@ -3119,6 +3117,7 @@ aac_ioctl_send_raw_srb(struct aac_softc *sc, caddr_t arg) #ifdef __amd64__ else if (fibsize == (sizeof(struct aac_srb) + srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry64))) { + struct aac_sg_entry64 *sge64; struct aac_sg_entry64 sg; sge = NULL;
