git: b4c2a5b68986 - main - arm64: coresight: fix the build without FDT

From: Kyle Evans <kevans_at_FreeBSD.org>
Date: Thu, 29 Sep 2022 19:33:50 UTC
The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=b4c2a5b689864430583eee96e449519db15911b9

commit b4c2a5b689864430583eee96e449519db15911b9
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2022-09-29 19:33:33 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
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 <sys/bus.h>
+#include <sys/malloc.h>
 
 #ifdef FDT
 #include <dev/ofw/openfirm.h>
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