[PATCH v3 4/5] cobalt/rtdm: Prepare for new signature of mm_get_unmapped_area() in 6.19
Florian Bezdeka <[email protected]>
| Newsgroups | dev.linux.lists.xenomai |
|---|---|
| Message-ID | <[email protected]> |
Since 6.19 the signature of mm_get_unmapped_area() has one parameter less. The (previously) first struct mm_struct *mm parameter has been removed. Signed-off-by: Florian Bezdeka <[email protected]> --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 8 ++++++-- kernel/cobalt/rtdm/drvlib.c | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 838085d338b51a4fdd89218aa512de8d60a853a0..baf54dcfe7bb5071a1abea48bd87f471eb938297 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -63,8 +63,12 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(6,10,0) -#define mm_get_unmapped_area(__mm, __filp, __addr, __len, __pgoff, __flags) \ - (__mm)->get_unmapped_area(__filp, __addr, __len, __pgoff, __flags) +#define mm_get_unmapped_area(__filp, __addr, __len, __pgoff, __flags) \ + (current->mm) \ + ->get_unmapped_area(__filp, __addr, __len, __pgoff, __flags) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,19,0) +#define mm_get_unmapped_area(filp, addr, len, pgoff, flags) \ + mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, flags) #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(6,16,0) diff --git a/kernel/cobalt/rtdm/drvlib.c b/kernel/cobalt/rtdm/drvlib.c index 86788743fe47b228662ef16831b4281ddefd04ff..d9de62946611c63728b43ff43543374e6ca8d34c 100644 --- a/kernel/cobalt/rtdm/drvlib.c +++ b/kernel/cobalt/rtdm/drvlib.c @@ -1907,8 +1907,7 @@ driver_get_unmapped_area(struct file *filp, #ifdef CONFIG_MMU /* Run default handler. */ - return mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, - flags); + return mm_get_unmapped_area(filp, addr, len, pgoff, flags); #else return -ENODEV; #endif -- 2.53.0