[folded-merged] include-asm-generic-fixmaph-reimplement-nasty-macros-in-c-fix.patch removed from -mm tree

[folded-merged] include-asm-generic-fixmaph-reimplement-nasty-macros-in-c-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: include-asm-generic-fixmaph-reimplement-nasty-macros-in-c-fix
has been removed from the -mm tree.  Its filename was
     include-asm-generic-fixmaph-reimplement-nasty-macros-in-c-fix.patch

This patch was dropped because it was folded into include-asm-generic-fixmaph-reimplement-nasty-macros-in-c.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: include-asm-generic-fixmaph-reimplement-nasty-macros-in-c-fix
Date: Sun Apr 26 04:00:43 AM PDT 2026

convert set_fixmap_io() also

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Laight <david.laight.linux@gmail.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Min-Hsun Chang <chmh0624@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-generic/fixmap.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/include/asm-generic/fixmap.h~include-asm-generic-fixmaph-reimplement-nasty-macros-in-c-fix
+++ a/include/asm-generic/fixmap.h
@@ -102,8 +102,10 @@ set_fixmap_offset_nocache(enum fixed_add
 /*
  * Some fixmaps are for IO
  */
-#define set_fixmap_io(idx, phys) \
-	__set_fixmap(idx, phys, FIXMAP_PAGE_IO)
+static inline void set_fixmap_io(enum fixed_addresses idx, phys_addr_t phys)
+{
+	__set_fixmap(idx, phys, FIXMAP_PAGE_IO);
+}
 
 #endif /* __ASSEMBLY__ */
 #endif /* __ASM_GENERIC_FIXMAP_H */
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

mm-page_alloc-fix-initialization-of-tags-of-the-huge-zero-folio-with-init_on_free-fix.patch
proc-rewrite-next_tgid-fix.patch
include-asm-generic-fixmaph-reimplement-nasty-macros-in-c.patch
include-asm-generic-fixmaph-reimplement-nasty-macros-in-c-fix-fix.patch