Module Name: src
Committed By: riastradh
Date: Mon Jun 29 23:53:12 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: fpu.c
src/sys/crypto/aes/arch/arm: aes_armv8.c
Added Files:
src/sys/arch/arm/include: fpu.h
Removed Files:
src/sys/arch/aarch64/include: fpu.h
Log Message:
Move aarch64/fpu.h to arm/fpu.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/fpu.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/aarch64/include/fpu.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/include/fpu.h
cvs rdiff -u -r1.1 -r1.2 src/sys/crypto/aes/arch/arm/aes_armv8.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/fpu.c
diff -u src/sys/arch/aarch64/aarch64/fpu.c:1.4 src/sys/arch/aarch64/aarch64/fpu.c:1.5
--- src/sys/arch/aarch64/aarch64/fpu.c:1.4 Mon Jun 29 23:22:27 2020
+++ src/sys/arch/aarch64/aarch64/fpu.c Mon Jun 29 23:53:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.4 2020/06/29 23:22:27 riastradh Exp $ */
+/* $NetBSD: fpu.c,v 1.5 2020/06/29 23:53:12 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,14 +31,15 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: fpu.c,v 1.4 2020/06/29 23:22:27 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: fpu.c,v 1.5 2020/06/29 23:53:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
#include <sys/lwp.h>
#include <sys/evcnt.h>
-#include <aarch64/fpu.h>
+#include <arm/fpu.h>
+
#include <aarch64/locore.h>
#include <aarch64/reg.h>
#include <aarch64/pcb.h>
Index: src/sys/crypto/aes/arch/arm/aes_armv8.c
diff -u src/sys/crypto/aes/arch/arm/aes_armv8.c:1.1 src/sys/crypto/aes/arch/arm/aes_armv8.c:1.2
--- src/sys/crypto/aes/arch/arm/aes_armv8.c:1.1 Mon Jun 29 23:31:41 2020
+++ src/sys/crypto/aes/arch/arm/aes_armv8.c Mon Jun 29 23:53:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aes_armv8.c,v 1.1 2020/06/29 23:31:41 riastradh Exp $ */
+/* $NetBSD: aes_armv8.c,v 1.2 2020/06/29 23:53:12 riastradh Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aes_armv8.c,v 1.1 2020/06/29 23:31:41 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aes_armv8.c,v 1.2 2020/06/29 23:53:12 riastradh Exp $");
#include <sys/types.h>
#include <sys/proc.h>
@@ -36,8 +36,9 @@ __KERNEL_RCSID(1, "$NetBSD: aes_armv8.c,
#include <crypto/aes/aes.h>
#include <crypto/aes/arch/arm/aes_armv8.h>
+#include <arm/fpu.h>
+
#include <aarch64/armreg.h>
-#include <aarch64/fpu.h>
static void
aesarmv8_setenckey(struct aesenc *enc, const uint8_t key[static 16],
Added files:
Index: src/sys/arch/arm/include/fpu.h
diff -u /dev/null src/sys/arch/arm/include/fpu.h:1.1
--- /dev/null Mon Jun 29 23:53:12 2020
+++ src/sys/arch/arm/include/fpu.h Mon Jun 29 23:53:12 2020
@@ -0,0 +1,35 @@
+/* $NetBSD: fpu.h,v 1.1 2020/06/29 23:53:12 riastradh Exp $ */
+
+/*
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SYS_ARCH_ARM_FPU_H
+#define _SYS_ARCH_ARM_FPU_H
+
+void fpu_kern_enter(void);
+void fpu_kern_leave(void);
+
+#endif /* _SYS_ARCH_ARM_FPU_H */
