diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2021-06-24 05:10:26 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2021-06-24 05:10:26 +0000 |
| commit | 0acc529dc35f88836dbcbe75940954c75595b058 (patch) | |
| tree | 8e78b4e9c5ff7bc7fdc3c2415e9a2593c36da1c2 | |
| parent | 0c188c06c627b5de30eeeeb7cde00d071a80ecfa (diff) | |
| download | src-0acc529dc35f88836dbcbe75940954c75595b058.tar.gz src-0acc529dc35f88836dbcbe75940954c75595b058.zip | |
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.
| -rw-r--r-- | sys/arm64/arm64/machdep.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |