From f414e65d4bfaabbff1003ca0ea5be5defeca69b3 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 14 Jun 2022 12:45:30 -0500 Subject: [PATCH] linuxkm: eliminate duplicative WOLFSSL_KTHREADS macro (just use WOLFSSL_LINUXKM). --- linuxkm/linuxkm_wc_port.h | 2 -- wolfcrypt/src/wc_port.c | 2 +- wolfssl/internal.h | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/linuxkm/linuxkm_wc_port.h b/linuxkm/linuxkm_wc_port.h index d7a784c75..a822c971f 100644 --- a/linuxkm/linuxkm_wc_port.h +++ b/linuxkm/linuxkm_wc_port.h @@ -59,8 +59,6 @@ (int)_xatoi_res; \ }) - #define WOLFSSL_KTHREADS - #ifdef BUILDING_WOLFSSL #if defined(CONFIG_MIPS) && defined(HAVE_LINUXKM_PIE_SUPPORT) diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c index 759a9e4bd..a0593f111 100644 --- a/wolfcrypt/src/wc_port.c +++ b/wolfcrypt/src/wc_port.c @@ -1332,7 +1332,7 @@ int wolfSSL_CryptHwMutexUnLock(void) return BAD_MUTEX_E; } -#elif defined(WOLFSSL_KTHREADS) +#elif defined(WOLFSSL_LINUXKM) /* Linux kernel mutex routines are voids, alas. */ diff --git a/wolfssl/internal.h b/wolfssl/internal.h index c2aa17722..2b5d40ebe 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -199,8 +199,7 @@ #else #ifndef SINGLE_THREADED #if defined(WOLFSSL_LINUXKM) - #define WOLFSSL_KTHREADS - #include + /* setup is in linuxkm/linuxkm_wc_port.h */ #elif defined(WOLFSSL_USER_MUTEX) /* do nothing */ #else