mm-mmzoneh-simplify-is_highmem_idx.patch removed from -mm tree
The patch titled
Subject: mm/mmzone.h: simplify is_highmem_idx()
has been removed from the -mm tree. Its filename was
mm-mmzoneh-simplify-is_highmem_idx.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: mm/mmzone.h: simplify is_highmem_idx()
There is a lot of historical ifdefery in is_highmem_idx() and its helper zone_movable_is_highmem() that was required because of two different paths for nodes and zones initialization that were selected at compile time.
Until commit 3f08a302f533 ("mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option") the movable_zone variable was only available for configurations that had CONFIG_HAVE_MEMBLOCK_NODE_MAP enabled so the test in zone_movable_is_highmem() used that variable only for such configurations. For other configurations the test checked if the index of ZONE_MOVABLE was greater by 1 than the index of ZONE_HIGMEM and then movable zone was considered a highmem zone. Needless to say, ZONE_MOVABLE - 1 equals ZONE_HIGHMEM by definition when CONFIG_HIGHMEM=y.
Commit 3f08a302f533 ("mm: remove CONFIG_HAVE_MEMBLOCK_NODE_MAP option") made movable_zone variable always available. Since this variable is set to ZONE_HIGHMEM if CONFIG_HIGHMEM is enabled and highmem zone is populated, it is enough to check whether
zone_idx == ZONE_MOVABLE && movable_zone == ZONE_HIGMEM
to test if zone index points to a highmem zone.
Remove zone_movable_is_highmem() that is not used anywhere except is_highmem_idx() and use the test above in is_highmem_idx() instead.
---
include/linux/mmzone.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
include/linux/mmzone.h renamed from include/linux/mmzone.h~mm-mmzoneh-simplify-is_highmem_idx +1 -12
@@ -982,22 +982,11 @@ static inline void zone_set_nid(struct zextern int movable_zone; -#ifdef CONFIG_HIGHMEM -static inline int zone_movable_is_highmem (void ) -{ -#ifdef CONFIG_NEED_MULTIPLE_NODES -return movable_zone ==ZONE_HIGHMEM ; -#else -return (ZONE_MOVABLE -1 ) ==ZONE_HIGHMEM ; -#endif -} -#endif -static inline int is_highmem_idx (enum zone_type idx) {#ifdef CONFIG_HIGHMEM return (idx ==ZONE_HIGHMEM || - (idx ==ZONE_MOVABLE &&zone_movable_is_highmem ())); + (idx ==ZONE_MOVABLE && movable_zone ==ZONE_HIGHMEM ));#else return 0 ;#endif
_
Patches currently in -mm which might be from [email protected] are
mmap-make-mlock_future_check-global.patch riscv-kconfig-make-direct-map-manipulation-options-depend-on-mmu.patch set_memory-allow-querying-whether-set_direct_map_-is-actually-enabled.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-where-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch