diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-11-28 13:47:19 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-11-28 14:46:57 +0100 |
commit | 26f10d8fbd04641a79433fc29b2cef80a972ac69 (patch) | |
tree | 126b183598d68387d4a62cd484c8125a51b543ba | |
parent | cd5302af5b7ea229ae4e4dc8964f5bfac77ee3a1 (diff) |
compat: support RAP in assembly
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r-- | src/compat/Kbuild.include | 2 | ||||
-rw-r--r-- | src/compat/compat-asm.h | 15 |
2 files changed, 17 insertions, 0 deletions
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 */ |