The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8173fa60ddb7e9a805dec9fef7bf07e74ae4144d

commit 8173fa60ddb7e9a805dec9fef7bf07e74ae4144d
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2023-08-25 19:33:00 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2023-08-25 19:33:00 +0000

    efirt: Move comment about fpu_kern_enter to where it is called
    
    Reviewed by:    imp, kib, andrew, markj
    Differential Revision:  https://reviews.freebsd.org/D41576
---
 sys/amd64/amd64/efirt_machdep.c | 5 -----
 sys/dev/efidev/efirt.c          | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c
index 419f27a236bf..22d8cf963880 100644
--- a/sys/amd64/amd64/efirt_machdep.c
+++ b/sys/amd64/amd64/efirt_machdep.c
@@ -280,11 +280,6 @@ fail:
  * reason to bother with the virtual map, and no need to add a
  * complexity into loader.
  *
- * The fpu_kern_enter() call allows firmware to use FPU, as mandated
- * by the specification.  In particular, CR0.TS bit is cleared.  Also
- * it enters critical section, giving us neccessary protection against
- * context switch.
- *
  * There is no need to disable interrupts around the change of %cr3,
  * the kernel mappings are correct, while we only grabbed the
  * userspace portion of VA.  Interrupts handlers must not access
diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c
index 535a6caa75bd..2d45b4d6ac66 100644
--- a/sys/dev/efidev/efirt.c
+++ b/sys/dev/efidev/efirt.c
@@ -285,6 +285,11 @@ rt_ok(void)
        return (0);
 }
 
+/*
+ * The fpu_kern_enter() call in allows firmware to use FPU, as
+ * mandated by the specification.  It also enters a critical section,
+ * giving us neccessary protection against context switches.
+ */
 static int
 efi_enter(void)
 {

Reply via email to