From 2a3fd57b36c7706bc126fb10a9f34e72dd00fd86 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 19 Aug 2020 13:39:54 -0500 Subject: [PATCH] linuxkm/Kbuild, linuxkm/module_hooks.c: tweaks for buildability on kernel 4.9 (may also fix build on 3.x). --- linuxkm/Kbuild | 5 +---- linuxkm/module_hooks.c | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/linuxkm/Kbuild b/linuxkm/Kbuild index 83d1d3c68..f3043d7fb 100644 --- a/linuxkm/Kbuild +++ b/linuxkm/Kbuild @@ -18,12 +18,9 @@ ifeq "$(WOLFSSL_CFLAGS)" "" $(error $$WOLFSSL_CFLAGS is unset.) endif -ifeq "$(WOLFSSL_ASFLAGS)" "" -$(error $$WOLFSSL_ASFLAGS is unset.) -endif - libwolfssl-y := $(WOLFSSL_OBJ_FILES) ccflags-y := $(WOLFSSL_CFLAGS) +%/libwolfssl.mod.o: ccflags-y := asflags-y := $(WOLFSSL_ASFLAGS) diff --git a/linuxkm/module_hooks.c b/linuxkm/module_hooks.c index 1a25bad04..ff90e6488 100644 --- a/linuxkm/module_hooks.c +++ b/linuxkm/module_hooks.c @@ -10,7 +10,11 @@ #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) static int __init wolfssl_init(void) +#else +static int wolfssl_init(void) +#endif { int ret = wolfSSL_Init(); if (ret != WOLFSSL_SUCCESS) { @@ -26,7 +30,11 @@ static int __init wolfssl_init(void) module_init(wolfssl_init); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) static void __exit wolfssl_exit(void) +#else +static void wolfssl_exit(void) +#endif { int ret = wolfSSL_Cleanup(); if (ret != WOLFSSL_SUCCESS)