iomem-remove-__weak-ioremap_cache-helper.patch removed from -mm tree
The quilt patch titled
Subject: kernel/iomem.c: remove __weak ioremap_cache helper
has been removed from the -mm tree. Its filename was
iomem-remove-__weak-ioremap_cache-helper.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: kernel/iomem.c: remove __weak ioremap_cache helper
Date: Wed, 26 Jul 2023 16:54:09 +0200
No portable code calls into this function any more, and on architectures that don't use or define their own, it causes a warning:
kernel/iomem.c:10:22: warning: no previous prototype for 'ioremap_cache' [-Wmissing-prototypes]
10 | __weak void __iomem *ioremap_cache(resource_size_t offset, unsigned long size)
Fold it into the only caller that uses it on architectures without the #define.
Note that the fallback to ioremap is probably still wrong on those architectures, but this is what it's always done there.
---
kernel/iomem.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
kernel/iomem.c renamed from kernel/iomem.c~iomem-remove-__weak-ioremap_cache-helper +4 -8
@@ -5,18 +5,14 @@#include <linux/mm.h> #include <linux/ioremap.h> -#ifndef ioremap_cache -/* temporary while we convert existing ioremap_cache users to memremap */ -__weak void __iomem *ioremap_cache (resource_size_t offset,unsigned long size) -{ -return ioremap (offset, size); -} -#endif -#ifndef arch_memremap_wbstatic void *arch_memremap_wb (resource_size_t offset,unsigned long size) { +#ifdef ioremap_cachereturn (__force void *)ioremap_cache (offset, size); +#else +return (__force void *)ioremap (offset, size); +#endif }#endif
_
Patches currently in -mm which might be from [email protected] are