Module Name: src
Committed By: skrll
Date: Tue May 3 20:10:20 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: efi_machdep.c
Log Message:
Style. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/aarch64/efi_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/efi_machdep.c
diff -u src/sys/arch/aarch64/aarch64/efi_machdep.c:1.12 src/sys/arch/aarch64/aarch64/efi_machdep.c:1.13
--- src/sys/arch/aarch64/aarch64/efi_machdep.c:1.12 Wed Apr 27 23:38:31 2022
+++ src/sys/arch/aarch64/aarch64/efi_machdep.c Tue May 3 20:10:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.12 2022/04/27 23:38:31 ryo Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.12 2022/04/27 23:38:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
@@ -106,11 +106,9 @@ arm_efirt_md_map_range(vaddr_t va, paddr
int
arm_efirt_md_enter(void)
{
- struct lwp *l;
- int err;
-
kpreempt_disable();
- l = curlwp;
+
+ struct lwp * const l = curlwp;
/* Save FPU state */
arm_efirt_state.fpu_used = fpu_used_p(l) != 0;
@@ -125,7 +123,7 @@ arm_efirt_md_enter(void)
* Install custom fault handler. EFI lock is held across calls so
* shared faultbuf is safe here.
*/
- err = cpu_set_onfault(&arm_efirt_state.faultbuf);
+ int err = cpu_set_onfault(&arm_efirt_state.faultbuf);
if (err)
return err;
@@ -142,7 +140,7 @@ arm_efirt_md_enter(void)
void
arm_efirt_md_exit(void)
{
- struct lwp *l = curlwp;
+ struct lwp * const l = curlwp;
if (efi_userva) {
pmap_deactivate_efirt();
@@ -151,7 +149,6 @@ arm_efirt_md_exit(void)
}
}
-
/* Disable FP access */
reg_cpacr_el1_write(CPACR_FPEN_NONE);
isb();
