From nobody Sat Apr 9 00:27:59 2022 X-Original-To: dev-commits-src-all@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 A38581AAC3B4; Sat, 9 Apr 2022 00:28:01 +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 4KZwv53ylCz3pJt; Sat, 9 Apr 2022 00:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464081; 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=2GzaOU9GcvDujCpyq6LK0OTW8p/Vfiq7s7czw5wB05Y=; b=aRPANthKz+ezFC2qqWDhq4bGIWQAn0oLz6pmuV8sEjE4OTdawQy2mIOL6wa8uFlRH7RRpD 49Gs4BqQCO8TUFVzYY89AWG/iIzbTIR3HbacY5p4R/8Dvbe5VWuV8jK+EadLhB9Zx8JjGG QlmqOQ76YCZO6qXuhlVmjTj9yqoKBT587/z5j3hKfRQnzdYufvZHAjxwKFQ32sZ4jrob3T p29QsmA/cuD0XWsNiTfoPDWL48mFKUO5d48tiuP0W1RayF/WQTOF8TMPULBqEqjTMpKgxD Fxo2YIh0ErM6YymAy6tkFGv7kjoPbFcptnUae2+puSG3NpmMAhtdBzxcTbBKHQ== 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 F152A77A4; Sat, 9 Apr 2022 00:27:59 +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 2390Rxp4056742; Sat, 9 Apr 2022 00:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2390Rx5w056741; Sat, 9 Apr 2022 00:27:59 GMT (envelope-from git) Date: Sat, 9 Apr 2022 00:27:59 GMT Message-Id: <202204090027.2390Rx5w056741@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: 0ed1db1aad5f - main - arm bus_dma_tag_destroy: Move dmat_copy under #ifdef KTR. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 0ed1db1aad5f529b32cf45848b842b374406a5be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464081; 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=2GzaOU9GcvDujCpyq6LK0OTW8p/Vfiq7s7czw5wB05Y=; b=coG8ax273cC33Sa8mxp2CY7Wy5lGn1UIyuZHTpBoKd37kIPvtcIM6y0KhbOUSxFuDUbn4F HKlIyiQxvqXc73YiDZuG3/G5TzLSPMJrplh8PNsn5Dmr2xM9P5YPGJX+VF3JpBE8hZlofy JK/S6VjEefUu9tPH6ne2oR9jShfSEsYqAMXknO3mt+AI0N+ZIGzu2fKecjrrvcqj0ZJXie owNe3VfrSgzNJdFmdXcPSMeAQFhIgHeN2ckhhbZroW/HQPhCToE0yycXyecdFEv4QUgS/j vTcEUXR0rMYjFCwIJOCvDdmY0z8DTad0uEuFW0IZ+o/G7GMKLuMi0amxOGgV6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649464081; a=rsa-sha256; cv=none; b=ou6QhSe6T2MdSc5PTLawUvOXsk00k+eB4iqFxWkj6xngbne7VVZQH4MwoNzmWo8DmGrzGF jCCbRYtQnBOVkhqMtD9zELlUEb0HWGCKaMk7Vp28vI2vuN5HH6lAZKnzKH66GSERPrHZut 6HlEQPx0OEIDSxyIEMvwdP8K4pUNjAzhWwZsskHahnGJQQhagAV5pUyivz2Ix/aensB03a i5eSyaL3msITltO32u9AcsD7MSoh5t2d0CMco7tcZ5DbPK7vRY3PSQi1KJacAqRBej8zH7 3U711NVs3qXF7HRNJAbViExPwAFCzVPa8JSLt//IWcPHIk+7uvrYJsUq5QG8gg== 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=0ed1db1aad5f529b32cf45848b842b374406a5be commit 0ed1db1aad5f529b32cf45848b842b374406a5be Author: John Baldwin AuthorDate: 2022-04-09 00:25:14 +0000 Commit: John Baldwin CommitDate: 2022-04-09 00:25:14 +0000 arm bus_dma_tag_destroy: Move dmat_copy under #ifdef KTR. --- sys/arm/arm/busdma_machdep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index a754cb13ddc5..ccf593b11aa5 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -535,11 +535,12 @@ bus_dma_tag_set_domain(bus_dma_tag_t dmat, int domain) int bus_dma_tag_destroy(bus_dma_tag_t dmat) { - bus_dma_tag_t dmat_copy; +#ifdef KTR + bus_dma_tag_t dmat_copy = dmat; +#endif int error; error = 0; - dmat_copy = dmat; if (dmat != NULL) { if (dmat->map_count != 0) {