From 1565fb29a78f0e70bd1dd4287ee7b87854131c1e Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sun, 2 Sep 2018 21:16:43 +0000 Subject: [PATCH] Add amd64 mdthread fields needed for the upcoming EFI RT exception handling. This is split into a separate commit from the main change to make it easier to handle possible revert after upcoming KBI freeze. Reviewed by: kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Approved by: re (rgrimes) Differential revision: https://reviews.freebsd.org/D16972 --- sys/amd64/include/proc.h | 2 ++ sys/kern/kern_thread.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h index f52c71208e64..54f5b416a7d4 100644 --- a/sys/amd64/include/proc.h +++ b/sys/amd64/include/proc.h @@ -62,6 +62,8 @@ struct mdthread { register_t md_saved_flags; /* (k) */ register_t md_spurflt_addr; /* (k) Spurious page fault address. */ struct pmap_invl_gen md_invl_gen; + register_t md_efirt_tmp; /* (k) */ + int md_efirt_dis_pf; /* (k) */ }; struct mdproc { diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 79b34dc76499..b60c2d5b40ef 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -83,7 +83,7 @@ _Static_assert(offsetof(struct thread, td_pflags) == 0x104, "struct thread KBI td_pflags"); _Static_assert(offsetof(struct thread, td_frame) == 0x470, "struct thread KBI td_frame"); -_Static_assert(offsetof(struct thread, td_emuldata) == 0x518, +_Static_assert(offsetof(struct thread, td_emuldata) == 0x528, "struct thread KBI td_emuldata"); _Static_assert(offsetof(struct proc, p_flag) == 0xb0, "struct proc KBI p_flag");