Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2024 13:16:02 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 31ca046e2250 - main - arm: Only define get_cntxct_a64_unstable when used
Message-ID:  <202409091316.489DG2cq051327@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by andrew:

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

commit 31ca046e2250e30cb92a546ecad7ec07e4b016ca
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-09-09 13:15:39 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-09-09 13:15:39 +0000

    arm: Only define get_cntxct_a64_unstable when used
    
    When building an ACPI only kernel get_cntxct_a64_unstable in the Arm
    generic tiner driver is unused. Add an #ifdef FDT check around it.
    
    Sponsored by:   Arm Ltd
---
 sys/arm/arm/generic_timer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index d3e264527a7f..9b5f0f52368b 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -187,6 +187,7 @@ get_freq(void)
 	return (get_el0(cntfrq));
 }
 
+#ifdef FDT
 static uint64_t
 get_cntxct_a64_unstable(bool physical)
 {
@@ -208,6 +209,7 @@ get_cntxct_a64_unstable(bool physical)
 
 	return (val);
 }
+#endif
 
 static uint64_t
 get_cntxct(bool physical)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409091316.489DG2cq051327>