From nobody Thu Sep 29 19:33:50 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 4Mdk7M0Mbnz4V4Ly; Thu, 29 Sep 2022 19:33:51 +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 4Mdk7L72fVz4Nx5; Thu, 29 Sep 2022 19:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664480031; 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=UCma9OgGnrLvKU66nQYQQE09fhV+0U1nOzPUXvxuPr4=; b=rCWgOWYluxsGZzObUgHKZZ6o5wnCo/X2I6jNhvdHk9Bh1C4wG3dJwvNSzOIsg+a6NULB6h /w75nHvm36cDkJV/+oFgP7sK82UmIzqsuFlSO0aEY4IGu5+GdBRYybsFYKPciREEhlL9LT h1cS+s3GSU23CDV/TWlhC5V+tpExM6Fm4gFbv+6WTT7efpkiNVvIjqDdB6SJm0f6B1o+ek /3saB6ddDxTnFaO3pS/J+EHMEBvOJX/D0rLZI+vVZhFESqZdQOO5doyINjrCsRiU00zZ9R p/kwWRYNIo0UfRY8Td1JzsvAdBPsAPPKnRwpqIslhxrIY7n8809c06t2wUhSjw== 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 4Mdk7L67fjzvpK; Thu, 29 Sep 2022 19:33:50 +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 28TJXoG4015071; Thu, 29 Sep 2022 19:33:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TJXoxd015070; Thu, 29 Sep 2022 19:33:50 GMT (envelope-from git) Date: Thu, 29 Sep 2022 19:33:50 GMT Message-Id: <202209291933.28TJXoxd015070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b4c2a5b68986 - main - arm64: coresight: fix the build without FDT 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4c2a5b689864430583eee96e449519db15911b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664480031; 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=UCma9OgGnrLvKU66nQYQQE09fhV+0U1nOzPUXvxuPr4=; b=SgZg0NL0LEY9xgBuvgf0zieO6IlLryL6ntvFDXqfyKTJbJ2x1+3a6miDuOnqs/xImgKMBp TWVV7Q3bHhi4sDXeAHKS/BpyUa3rjrg8Ia3n4Wslnb5hiuz5AqBS1tUyQ+kPy9EiXqIzuZ NFzfd+gtwXpO/PnAQnsk4KGLfJBZb02LxYwA3WBElwox2Ac39hp+B8x/0shR/2B7Cbs5l5 +Navx1om2MxqcLfOsVFor9qy1OITrt0y6hC5VroQ/DBssYWl0J/GBR5ZtVm3LdSlNkx2I9 BSEaWFfa7/Yh4W7xxn0DkDB5Qgnb7Lvhu/VoWrvUy0SHmdMBP+0+P2nS/4C2EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664480031; a=rsa-sha256; cv=none; b=LsoMLkNmQRiXV30Cds4dNSbJ0HwyfZKnLfTvUejKYBGqmnvQq6T5M58COPn9TxL7PATu/R 1mXpLGQW0VYbf+SGZagAixyQDFdaqW2hXBcppTlJrf/KOG0r6zyqPQwVevahHO8ypd0ebw uXvfaTfoABksPK8usedG5Z59oEztrd3Da9hAQ/8wwNcGkkSQFT3S9cuGGneQBw4touDJu9 eK67Tzk6i0yF5Wd1rGMngE2obVWeqJ4rjSymFPPZ+FpHTNdFlsm4voyIyXVUh8lcw1brrc dQlHGgDi6GftKodMY8Vr+XvEiqXb4ciS4guj4gXCt0uHJVfmQjU/Ke2cQUr9OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c2a5b689864430583eee96e449519db15911b9 commit b4c2a5b689864430583eee96e449519db15911b9 Author: Kyle Evans AuthorDate: 2022-09-29 19:33:33 +0000 Commit: Kyle Evans CommitDate: 2022-09-29 19:33:33 +0000 arm64: coresight: fix the build without FDT coresight_cpu_debug only has an FDT attachment, so let's not build it for kernels without FDT. coresight.h includes sys/malloc.h via header pollution dev/ofw/openfirm.h; include it directly in case we're building without FDT. Reviewed by: andrew, manu Differential Revision: https://reviews.freebsd.org/D36789 --- sys/arm64/coresight/coresight.h | 1 + sys/conf/files.arm64 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/coresight/coresight.h b/sys/arm64/coresight/coresight.h index a3aa71cb207f..adbf17ce08df 100644 --- a/sys/arm64/coresight/coresight.h +++ b/sys/arm64/coresight/coresight.h @@ -37,6 +37,7 @@ #include "opt_platform.h" #include +#include #ifdef FDT #include diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index d2cf3651a68d..3a92f05bea63 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -88,7 +88,7 @@ arm64/coresight/coresight_acpi.c optional acpi arm64/coresight/coresight_fdt.c optional fdt arm64/coresight/coresight_if.m standard arm64/coresight/coresight_cmd.c standard -arm64/coresight/coresight_cpu_debug.c standard +arm64/coresight/coresight_cpu_debug.c optional fdt arm64/coresight/coresight_etm4x.c standard arm64/coresight/coresight_etm4x_acpi.c optional acpi arm64/coresight/coresight_etm4x_fdt.c optional fdt