From 6f18ba15b06040c25ad8b05a89194cdeccce9e19 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Mon, 1 Nov 2021 12:03:41 -0500 Subject: [PATCH] linuxkm: accommodate printk()->_printk() renaming in kernel 5.15+. --- linuxkm/module_hooks.c | 6 +++++- wolfssl/wolfcrypt/wc_port.h | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/linuxkm/module_hooks.c b/linuxkm/module_hooks.c index 634e0b65b..9cea95a72 100644 --- a/linuxkm/module_hooks.c +++ b/linuxkm/module_hooks.c @@ -362,7 +362,11 @@ static int set_up_wolfssl_linuxkm_pie_redirect_table(void) { #endif wolfssl_linuxkm_pie_redirect_table.kstrtoll = kstrtoll; - wolfssl_linuxkm_pie_redirect_table.printk = printk; + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) + wolfssl_linuxkm_pie_redirect_table._printk = _printk; + #else + wolfssl_linuxkm_pie_redirect_table.printk = printk; + #endif wolfssl_linuxkm_pie_redirect_table.snprintf = snprintf; wolfssl_linuxkm_pie_redirect_table._ctype = _ctype; diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h index dfd595b80..d3a927674 100644 --- a/wolfssl/wolfcrypt/wc_port.h +++ b/wolfssl/wolfcrypt/wc_port.h @@ -241,7 +241,11 @@ #endif typeof(kstrtoll) *kstrtoll; - typeof(printk) *printk; + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) + typeof(_printk) *_printk; + #else + typeof(printk) *printk; + #endif typeof(snprintf) *snprintf; const unsigned char *_ctype; @@ -357,7 +361,11 @@ #endif #define kstrtoll (wolfssl_linuxkm_get_pie_redirect_table()->kstrtoll) - #define printk (wolfssl_linuxkm_get_pie_redirect_table()->printk) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) + #define _printk (wolfssl_linuxkm_get_pie_redirect_table()->_printk) + #else + #define printk (wolfssl_linuxkm_get_pie_redirect_table()->printk) + #endif #define snprintf (wolfssl_linuxkm_get_pie_redirect_table()->snprintf) #define _ctype (wolfssl_linuxkm_get_pie_redirect_table()->_ctype)