From: Lee Chee Yang <[email protected]> Signed-off-by: Lee Chee Yang <[email protected]> --- ...fix-redefinition-of-crypto_request_complete.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch b/recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch index 883be25..3cdbd2f 100644 --- a/recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch +++ b/recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch @@ -9,27 +9,29 @@ Fix : | | ^~~~~~~~~~~~~~~~~~~~~~~ | In file included from <command-line>: -linux kernel backported crypto_request_complete to 6.1.29. +linux kernel backported crypto_request_complete to 6.1.29 and 5.15.112. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/crypto?h=linux-6.1.y&id=c35e03eaece71101ff6cbf776b86403860ac8cc3 +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=e7ce4ba11635ef23aa7ad40b4b9f9c52ef15f9e2 Upstream-Status: Pending Signed-off-by: Lee Chee Yang <[email protected]> --- - quickassist/qat/compat/qat_compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + quickassist/qat/compat/qat_compat.h | 3 +- + 1 file changed, 2 insertion(+), 1 deletion(-) diff --git a/quickassist/qat/compat/qat_compat.h b/quickassist/qat/compat/qat_compat.h index 8fcd14a..51b8098 100644 --- a/quickassist/qat/compat/qat_compat.h +++ b/quickassist/qat/compat/qat_compat.h -@@ -510,7 +510,7 @@ static inline void pci_ignore_hotplug(struct pci_dev *dev) +@@ -510,7 +511,8 @@ static inline void pci_ignore_hotplug(struct pci_dev *dev) void kfree_sensitive(const void *p); #endif -#if (KERNEL_VERSION(6, 3, 0) > LINUX_VERSION_CODE) -+#if ((KERNEL_VERSION(6, 1, 29) > LINUX_VERSION_CODE) ) ++#if (KERNEL_VERSION(6, 1, 29) > LINUX_VERSION_CODE && KERNEL_VERSION(6, 1, 0) < LINUX_VERSION_CODE ) || \ ++ (KERNEL_VERSION(5, 15, 112) > LINUX_VERSION_CODE) static inline void crypto_request_complete(struct crypto_async_request *req, int err) { -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8122): https://lists.yoctoproject.org/g/meta-intel/message/8122 Mute This Topic: https://lists.yoctoproject.org/mt/101868347/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
