From nobody Wed Nov 2 17:03:12 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 4N2Y9r3qyZz4gP87; Wed, 2 Nov 2022 17:03:12 +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 4N2Y9r2R24z3qHJ; Wed, 2 Nov 2022 17:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408592; 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=QTZpG+W76F+D/vmsNGWaH/yd3vkEyDkWlfih9beEALI=; b=rZZBp2mnk+tztq90rjHe9PEYwGppHneT18ONxGz0EFxvRDfBKFoU81zo43NI5iFrsiw7D1 +leF7xDcO057ws1Lzq4Oh9I8ncPxAKsdRMPnxoHaxe+/N4z+XsgxPPtbyKYoucC1eSFfpq x2Jopy15CLS57elLh4Jgs+S3DQ6NHBpnQl2PJ/I6uJjLHqAonqGaV2NjRbMOoIMvvh8f9d 8wzMMCxXI5Ahu5W5I7RHwPgXeFGdsGu4o0LXCTWFj6caFPusLeTrw3SbJn6SmzZFzYc/YH wjbxU+0B0j+vv38X90moCOWDE4ssXKgnrfNOBTy+hA69BZmJcnXxYul2swH+CQ== 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 4N2Y9r1W8Sz146m; Wed, 2 Nov 2022 17:03:12 +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 2A2H3Clb065083; Wed, 2 Nov 2022 17:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2H3Cf3065082; Wed, 2 Nov 2022 17:03:12 GMT (envelope-from git) Date: Wed, 2 Nov 2022 17:03:12 GMT Message-Id: <202211021703.2A2H3Cf3065082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 483b42cee78d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 483b42cee78dc7fc21e9f5e481f7b46c39173475 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408592; 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=QTZpG+W76F+D/vmsNGWaH/yd3vkEyDkWlfih9beEALI=; b=DTgWVYhJVyV4+pPidq0lY4wzcOAo0d6L5m3FyGC1zL/aRkWsaGjNMosEBmh5pqJ3PuZ6Vg kAX7W+dHwYkPGGtaka33GQxjMmeqeevHXyq0l+RG31nWJJ4y5ZioBaFj7a7lefaQN3oNnB uB96nDlwO2sSIJffAcyyCo8v3GczmvJm1a+GFYPMw1z9stoeCjYypvcKG02IT6jUH/h+be JxLBQxjMnyaiClBJr4MWwcVjMB1EycbLc/7xr2pk2fqbnoFIAL7OnFGv+0stl0rxIPF2yA kgBx3CsuXRgFdQ8sgDzCwwM3uk6Y/+1GzV6nGhsFvgvdf5lACyTY+//BMtGWxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667408592; a=rsa-sha256; cv=none; b=IrN8w7MVqBUQL/Snvkv4F4/Mx3ie1VLyczIaL7GloPPiI08goyMm0XWJLVzBgNmCaBU78G umlcItbZOWNNDrraVgDajIwYN4HbXIsAwwe+Eh8EbtBP0FbJHjX7kl4/6pDxeFyEm01UtL ALqqoaNKh7PFquo9jUow6orvbjLdB4RkwEgwE/0nIh+rAerBqMsDb0ToBKoS8fOfxEqlcY piBtB0B+ywhEq5bvg2QCkdF1uS+ZRahxIyJmlIMc2U2ghCHCjHGmjZaa90RL7lC0bXV2Jb jI9gxsAbt5Q1+CXt4iSf/uFISb/xzgBDwfghDlxSAfzAcIZOlqQTTayRFYLZRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=483b42cee78dc7fc21e9f5e481f7b46c39173475 commit 483b42cee78dc7fc21e9f5e481f7b46c39173475 Author: Kyle Evans AuthorDate: 2022-09-29 19:33:33 +0000 Commit: Kyle Evans CommitDate: 2022-11-02 17:02:25 +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 (cherry picked from commit b4c2a5b689864430583eee96e449519db15911b9) --- 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 05ee9b183df7..8c60edc29448 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -84,7 +84,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