summaryrefslogtreecommitdiff
path: root/drivers/net/wireguard/compat/compat-asm.h
diff options
context:
space:
mode:
authorRaghuram Subramani <raghus2247@gmail.com>2024-10-13 13:36:36 +0530
committerRaghuram Subramani <raghus2247@gmail.com>2024-10-13 13:36:36 +0530
commit6a21d8496b038d1e71fd6a9bd8a95880135665d9 (patch)
tree8f96e9273400c0eb8794f92aef733bb5fe52b658 /drivers/net/wireguard/compat/compat-asm.h
parentb73f506bc0ae7119f5f629b222596a27d7b2e99b (diff)
parent17d850f5a5bc1318b67a974b16d32a2dd3bab5cf (diff)
Merge remote-tracking branch 'msm8998/lineage-20'master
Diffstat (limited to 'drivers/net/wireguard/compat/compat-asm.h')
-rw-r--r--drivers/net/wireguard/compat/compat-asm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireguard/compat/compat-asm.h b/drivers/net/wireguard/compat/compat-asm.h
index fde21dabba4f..951fc1094470 100644
--- a/drivers/net/wireguard/compat/compat-asm.h
+++ b/drivers/net/wireguard/compat/compat-asm.h
@@ -15,14 +15,14 @@
#define ISRHEL7
#elif RHEL_MAJOR == 8
#define ISRHEL8
-#if RHEL_MINOR >= 4
+#if RHEL_MINOR >= 6
#define ISCENTOS8S
#endif
#endif
#endif
/* PaX compatibility */
-#if defined(RAP_PLUGIN)
+#if defined(RAP_PLUGIN) && defined(RAP_ENTRY)
#undef ENTRY
#define ENTRY RAP_ENTRY
#endif
@@ -51,7 +51,7 @@
#undef pull
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) && !defined(ISCENTOS8S)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) && !defined(ISRHEL8) && !defined(SYM_FUNC_START)
#define SYM_FUNC_START ENTRY
#define SYM_FUNC_END ENDPROC
#endif