From 2a5741d1706d8ff938dc681e359909746bd2f798 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 6 Sep 2018 20:55:59 -0600
Subject: compat: move simd.h from crypto to compat since it's going upstream

---
 src/compat/Kbuild.include            |  4 +++
 src/compat/simd/include/linux/simd.h | 65 ++++++++++++++++++++++++++++++++++++
 src/crypto/include/linux/simd.h      | 65 ------------------------------------
 3 files changed, 69 insertions(+), 65 deletions(-)
 create mode 100644 src/compat/simd/include/linux/simd.h
 delete mode 100644 src/crypto/include/linux/simd.h

diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include
index 04ffdeb..879aa84 100644
--- a/src/compat/Kbuild.include
+++ b/src/compat/Kbuild.include
@@ -37,6 +37,10 @@ ifeq ($(wildcard $(srctree)/arch/x86/include/asm/simd.h)$(CONFIG_X86),y)
 ccflags-y += -I$(src)/compat/simd-x86/include
 endif
 
+ifeq ($(wildcard $(srctree)/include/linux/simd.h),)
+ccflags-y += -I$(src)/compat/simd/include
+endif
+
 ifeq ($(wildcard $(srctree)/include/net/udp_tunnel.h),)
 ccflags-y += -I$(src)/compat/udp_tunnel/include
 wireguard-y += compat/udp_tunnel/udp_tunnel.o
diff --git a/src/compat/simd/include/linux/simd.h b/src/compat/simd/include/linux/simd.h
new file mode 100644
index 0000000..6adf0c3
--- /dev/null
+++ b/src/compat/simd/include/linux/simd.h
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
+
+#ifndef _WG_SIMD_H
+#define _WG_SIMD_H
+
+#include <linux/sched.h>
+#if defined(CONFIG_X86_64)
+#include <linux/version.h>
+#include <asm/fpu/api.h>
+#include <asm/simd.h>
+#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON)
+#include <asm/neon.h>
+#include <asm/simd.h>
+#endif
+
+typedef enum {
+	HAVE_NO_SIMD,
+	HAVE_FULL_SIMD
+} simd_context_t;
+
+static inline simd_context_t simd_get(void)
+{
+	bool have_simd = false;
+#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) && !defined(CONFIG_PREEMPT_RT_BASE)
+	have_simd = irq_fpu_usable();
+	if (have_simd)
+		kernel_fpu_begin();
+#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && !defined(CONFIG_PREEMPT_RT_BASE)
+#if defined(CONFIG_ARM64)
+	have_simd = true; /* ARM64 supports NEON in any context. */
+#elif defined(CONFIG_ARM)
+	have_simd = may_use_simd(); /* ARM doesn't support NEON in interrupt context. */
+#endif
+	if (have_simd)
+		kernel_neon_begin();
+#endif
+	return have_simd ? HAVE_FULL_SIMD : HAVE_NO_SIMD;
+}
+
+static inline void simd_put(simd_context_t prior_context)
+{
+#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) && !defined(CONFIG_PREEMPT_RT_BASE)
+	if (prior_context != HAVE_NO_SIMD)
+		kernel_fpu_end();
+#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && !defined(CONFIG_PREEMPT_RT_BASE)
+	if (prior_context != HAVE_NO_SIMD)
+		kernel_neon_end();
+#endif
+}
+
+static inline simd_context_t simd_relax(simd_context_t prior_context)
+{
+#ifdef CONFIG_PREEMPT
+	if (prior_context != HAVE_NO_SIMD && need_resched()) {
+		simd_put(prior_context);
+		return simd_get();
+	}
+#endif
+	return prior_context;
+}
+
+#endif /* _WG_SIMD_H */
diff --git a/src/crypto/include/linux/simd.h b/src/crypto/include/linux/simd.h
deleted file mode 100644
index 6adf0c3..0000000
--- a/src/crypto/include/linux/simd.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0
- *
- * Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- */
-
-#ifndef _WG_SIMD_H
-#define _WG_SIMD_H
-
-#include <linux/sched.h>
-#if defined(CONFIG_X86_64)
-#include <linux/version.h>
-#include <asm/fpu/api.h>
-#include <asm/simd.h>
-#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON)
-#include <asm/neon.h>
-#include <asm/simd.h>
-#endif
-
-typedef enum {
-	HAVE_NO_SIMD,
-	HAVE_FULL_SIMD
-} simd_context_t;
-
-static inline simd_context_t simd_get(void)
-{
-	bool have_simd = false;
-#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) && !defined(CONFIG_PREEMPT_RT_BASE)
-	have_simd = irq_fpu_usable();
-	if (have_simd)
-		kernel_fpu_begin();
-#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && !defined(CONFIG_PREEMPT_RT_BASE)
-#if defined(CONFIG_ARM64)
-	have_simd = true; /* ARM64 supports NEON in any context. */
-#elif defined(CONFIG_ARM)
-	have_simd = may_use_simd(); /* ARM doesn't support NEON in interrupt context. */
-#endif
-	if (have_simd)
-		kernel_neon_begin();
-#endif
-	return have_simd ? HAVE_FULL_SIMD : HAVE_NO_SIMD;
-}
-
-static inline void simd_put(simd_context_t prior_context)
-{
-#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) && !defined(CONFIG_PREEMPT_RT_BASE)
-	if (prior_context != HAVE_NO_SIMD)
-		kernel_fpu_end();
-#elif IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && !defined(CONFIG_PREEMPT_RT_BASE)
-	if (prior_context != HAVE_NO_SIMD)
-		kernel_neon_end();
-#endif
-}
-
-static inline simd_context_t simd_relax(simd_context_t prior_context)
-{
-#ifdef CONFIG_PREEMPT
-	if (prior_context != HAVE_NO_SIMD && need_resched()) {
-		simd_put(prior_context);
-		return simd_get();
-	}
-#endif
-	return prior_context;
-}
-
-#endif /* _WG_SIMD_H */
-- 
cgit v1.2.3-59-g8ed1b