ia64-remove-ifdef-config_zone_dma32-statements.patch removed from -mm tree
The patch titled
Subject: ia64: remove 'ifdef CONFIG_ZONE_DMA32' statements
has been removed from the -mm tree. Its filename was
ia64-remove-ifdef-config_zone_dma32-statements.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: ia64: remove 'ifdef CONFIG_ZONE_DMA32' statements
After the removal of SN2 platform (commit cf07cb1ff4ea ("ia64: remove support for the SGI SN2 platform") IA-64 always has ZONE_DMA32 and there is no point to guard code with this configuration option.
Remove ifdefery associated with CONFIG_ZONE_DMA32
---
arch/ia64/mm/contig.c | 2 -- arch/ia64/mm/discontig.c | 2 -- 2 files changed, 4 deletions(-)
arch/ia64/mm/contig.c renamed from arch/ia64/mm/contig.c~ia64-remove-ifdef-config_zone_dma32-statements +0 -2
@@ -177,10 +177,8 @@ paging_init (void)unsigned long max_zone_pfns[MAX_NR_ZONES ];memset (max_zone_pfns,0 ,sizeof (max_zone_pfns)); -#ifdef CONFIG_ZONE_DMA32 max_dma =virt_to_phys ((void *)MAX_DMA_ADDRESS ) >>PAGE_SHIFT ; max_zone_pfns[ZONE_DMA32 ] = max_dma; -#endif max_zone_pfns[ZONE_NORMAL ] = max_low_pfn;#ifdef CONFIG_VIRTUAL_MEM_MAP
arch/ia64/mm/discontig.c renamed from arch/ia64/mm/discontig.c~ia64-remove-ifdef-config_zone_dma32-statements +0 -2
@@ -621,9 +621,7 @@ void __init paging_init(void) }memset (max_zone_pfns,0 ,sizeof (max_zone_pfns)); -#ifdef CONFIG_ZONE_DMA32 max_zone_pfns[ZONE_DMA32 ] = max_dma; -#endif max_zone_pfns[ZONE_NORMAL ] = max_pfn;free_area_init (max_zone_pfns);
_
Patches currently in -mm which might be from [email protected] are
mm-memblock-enforce-overlap-of-memorymemblock-and-memoryreserved.patch mm-fix-initialization-of-struct-page-for-holes-in-memory-layout.patch mm-add-definition-of-pmd_page_order.patch mmap-make-mlock_future_check-global.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages.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 secretmem-use-pmd-size-pages-to-amortize-direct-map-fragmentation.patch secretmem-add-memcg-accounting.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-were-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch