From nobody Sat Apr 09 00:27:48 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 845461AABB97; Sat, 9 Apr 2022 00:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZwtr5slnz3pFM; Sat, 9 Apr 2022 00:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rstu2fsbFn05a7gEdlgHLMJEaRmr3c+B7BRf8j4SK/0=; b=NmwCPtq2ujgxDPb4XchrCNIk3nTBW7PjEb0WpuqLiLlIDGUxCKioLePPXdKuPLcEoOzhC6 YN6FxwEeA+txLDLj5lUGNsDYqWqOlWdMRHxgcedjrZuOSTrJji/1eu5Mat3dR3/XwHWDhs bcskzybQbABijsdxQmpOh9ZyDfEZaI2EffJ7FBGb/byW2feB9UioTXiCUkhytTGlE2Vrs5 O/3LmEeFTRcGvHZP0/BSzB2V6AZ3m+TqT1p/nTETb/hRw6MZm0Cp7kGbkbhfKKD6rgMQf0 wIwWWTADkwqBeteIu1jib7KVA6MLIzhzf4lde297m3VpMplEe0q5mBIk6A0S4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98E8674DD; Sat, 9 Apr 2022 00:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2390Rm44056476; Sat, 9 Apr 2022 00:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2390Rmlu056475; Sat, 9 Apr 2022 00:27:48 GMT (envelope-from git) Date: Sat, 9 Apr 2022 00:27:48 GMT Message-Id: <202204090027.2390Rmlu056475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5cd9d254039e - main - aac: Move sge64 declaration into the #ifdef __amd64__ block. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cd9d254039e06493919b43a1b6ee9939f5c800f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rstu2fsbFn05a7gEdlgHLMJEaRmr3c+B7BRf8j4SK/0=; b=tKuKvhbqklDJOI50Qym/IoEIZKw8xcUH4TaHUxCaAqSQG7s/0UgmH/x4L1bUppw8sHVcfl FNitdfQFU8ZP/fRIWq9hoS/QVcbQiCE+NB/nyzgIwRvejrptwfg9sORdhwtQwu+XGCrz1L CEVQ28PPvDj3BP6BXgrIacoVYpJMRnsZ40xeut59bZgHIH9zN/SyWBleqrip9DBayxQOYr cjVtu5DwYivmf2p9Ms7Pf0jK6iNmbwMSXHhzc/CMIUCWySgrq9srvyDc+1LlYasfivj6Ql jGY0nowLpGfbRDbeojM2cg94NSJJbKkvphnxQ/ZItr47ZRICQdsnqnW1BaNGJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649464069; a=rsa-sha256; cv=none; b=My0ovSkK8A2T3OQgQghS6VLcOoosui5tB1qxyn/YRA2eZtWN/hdyFN5jQNoxKyQEnw2G1k R2Nm7OQNw8KjflQc5Hmchi7fO4muR2NOKv5IUZY25t2efembrU8QVLbTYGJeAzXorYDsQU +Cl68jLfRp+hsHrw2WtfwAMxUOWycUgynai47EeOT6J5MQ5M3OYz/gQ9KQSVJvQc9TUT9a iHjcwQYtkwSxPvvM9FtnqLWpxAC+/AiO0ZMC39qb0o1N/7nUxkeYxcCoEUkgZfLg+J7Zwq p6ur5Tz+ZYN4okurSt3SJkocSQHL+49GheQjNen/a5MwZGh5DHaoV2s0La3A0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5cd9d254039e06493919b43a1b6ee9939f5c800f commit 5cd9d254039e06493919b43a1b6ee9939f5c800f Author: John Baldwin AuthorDate: 2022-04-09 00:25:13 +0000 Commit: John Baldwin 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;