The branch stable/13 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=21049f0567f2e1a206ef21e0614bd98d37214711
commit 21049f0567f2e1a206ef21e0614bd98d37214711
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-07-22 16:22:21 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-08-03 09:52:36 +0000
amd64: make efi_boot global
(cherry picked from commit 6a3821369f43bb1e8a672cbbfd7732406d9f9a4c)
---
sys/amd64/amd64/machdep.c | 3 ++-
sys/amd64/include/md_var.h | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 0098e926d0f0..93030cbe7126 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -228,6 +228,8 @@ struct mtx dt_lock; /* lock for GDT and LDT */
void (*vmm_resume_p)(void);
+bool efi_boot;
+
static void
cpu_startup(dummy)
void *dummy;
@@ -1613,7 +1615,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
struct region_descriptor r_gdt;
size_t kstack0_sz;
int late_console;
- bool efi_boot;
TSRAW(&thread0, TS_ENTER, __func__, NULL);
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 3b2454a4b441..b66e314d99b1 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -55,6 +55,8 @@ extern int la57;
*/
extern char kernphys[];
+extern bool efi_boot;
+
struct savefpu;
struct sysentvec;
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
