From f6094de9196a6108330054c595b6e12a4e396aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poulin?= Date: Sun, 29 Dec 2024 19:48:20 -0500 Subject: [PATCH] [module] MODULE_IMPORT_NS now requires a string literal in 6.13 Fixes: #1155 References: 33def8498fdde180023444b08e12b72a9efed41d Co-authored-by: HikariKnightt <2557889+HikariKnight@users.noreply.github.com> Co-authored-by: zeule Reviewed-by: netboy3 <1472804+netboy3@users.noreply.github.com> --- AUTHORS | 3 ++- module/dkms.conf | 2 +- module/kvmfr.c | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index f1e205ab..1535e2da 100644 --- a/AUTHORS +++ b/AUTHORS @@ -70,4 +70,5 @@ Zenithal (ZenithalHourlyRate) Kamplom <6284968128@protonmail.ch> (kamplom) Jacob McNamee (jacobmcnamee) Marco Antonio J. Costa (majcosta) -rs189 <35667100+rs189@users.noreply.github.com> (rs189) \ No newline at end of file +rs189 <35667100+rs189@users.noreply.github.com> (rs189) +Jérôme Poulin (ticpu) diff --git a/module/dkms.conf b/module/dkms.conf index 332123e6..8b66eda2 100644 --- a/module/dkms.conf +++ b/module/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="kvmfr" -PACKAGE_VERSION="0.0.11" +PACKAGE_VERSION="0.0.12" BUILT_MODULE_NAME[0]="${PACKAGE_NAME}" MAKE[0]="make KDIR=${kernel_source_dir}" CLEAN="make KDIR=${kernel_source_dir} clean" diff --git a/module/kvmfr.c b/module/kvmfr.c index 62149039..2b1e206e 100644 --- a/module/kvmfr.c +++ b/module/kvmfr.c @@ -654,7 +654,9 @@ MODULE_DEVICE_TABLE(pci, kvmfr_pci_ids); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Geoffrey McRae "); MODULE_AUTHOR("Guanzhong Chen "); -MODULE_VERSION("0.0.9"); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0) +MODULE_VERSION("0.0.12"); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,13,0) +MODULE_IMPORT_NS("DMA_BUF"); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0) MODULE_IMPORT_NS(DMA_BUF); #endif