From 0acc529dc35f88836dbcbe75940954c75595b058 Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Wed, 23 Jun 2021 22:10:26 -0700 Subject: arm64: Disable early printf if TSLOG The warning message "ERROR loading DTB" (for systems without a device tree blob) is printed extremely early in the boot process -- among other things, before curthread or other pcpu data has been set up. Unfortunately, printf is instrumented with TSLOG, which cannot run quite this early. Wrap the printf in #ifndef TSLOG; the situations where the printf will be useful are not ones where TSLOG would be in use. --- sys/arm64/arm64/machdep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 82a77ce184d8..439656f57f6d 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -1101,7 +1101,9 @@ try_load_dtb(caddr_t kmdp) #endif if (dtbp == (vm_offset_t)NULL) { +#ifndef TSLOG printf("ERROR loading DTB\n"); +#endif return; } -- cgit v1.2.3