From c45ed5529da5bf646fb7fe55bbe58543165600b9 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 28 Nov 2017 13:47:19 +0100
Subject: compat: support RAP in assembly

---
 src/compat/Kbuild.include |  2 ++
 src/compat/compat-asm.h   | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 src/compat/compat-asm.h

diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include
index f952f6b..2bbe9e9 100644
--- a/src/compat/Kbuild.include
+++ b/src/compat/Kbuild.include
@@ -1,7 +1,9 @@
 ifeq ($(wildcard $(src)/compat/compat.h),)
 ccflags-y += -include $(srctree)/$(src)/compat/compat.h
+asflags-y += -include $(srctree)/$(src)/compat/compat-asm.h
 else
 ccflags-y += -include $(src)/compat/compat.h
+asflags-y += -include $(src)/compat/compat-asm.h
 endif
 
 ifeq ($(wildcard $(srctree)/include/linux/ptr_ring.h),)
diff --git a/src/compat/compat-asm.h b/src/compat/compat-asm.h
new file mode 100644
index 0000000..548841d
--- /dev/null
+++ b/src/compat/compat-asm.h
@@ -0,0 +1,15 @@
+/* Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+
+#ifndef _WG_COMPATASM_H
+#define _WG_COMPATASM_H
+
+#include <linux/linkage.h>
+#include <linux/kconfig.h>
+
+/* PaX compatibility */
+#if defined(RAP_PLUGIN)
+#undef ENTRY
+#define ENTRY RAP_ENTRY
+#endif
+
+#endif /* _WG_COMPATASM_H */
-- 
cgit v1.2.3-59-g8ed1b