Merge branch 'apply-patches-from-gwen' into 'master'

Apply patches from Gwen See merge request be-cem-edl/fec/hardware-modules/fmc-adc-100m14b4cha!13

Merge branch 'apply-patches-from-gwen' into 'master'
Apply patches from Gwen See merge request be-cem-edl/fec/hardware-modules/fmc-adc-100m14b4cha!13
1e232a63 · Federico Vaga · 9cf28eed · 8c5fb947 · 1e232a63
Commit 1e232a63 authored Jun 08, 2023 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

fa-core.c software/kernel/fa-core.c +5 -0

No files found.
--- a/software/kernel/fa-core.c
+++ b/software/kernel/fa-core.c
@@ -52,6 +52,10 @@ static int fa_sg_alloc_table_from_pages(struct sg_table *sgt,
 					gfp_t gfp_mask)
 {
 #if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE
+	return sg_alloc_table_from_pages_segment(sgt, pages, n_pages, offset,
+					  size, max_segment, gfp_mask);
+#else
 	struct scatterlist *sg;

 	sg =  __sg_alloc_table_from_pages(sgt, pages, n_pages, offset, size,
@@ -60,6 +64,7 @@ static int fa_sg_alloc_table_from_pages(struct sg_table *sgt,
 		return PTR_ERR(sg);
 	else
 		return 0;
+#endif
 #else
 	return __sg_alloc_table_from_pages(sgt, pages, n_pages, offset, size,
 			max_segment, gfp_mask);