[folded-merged] mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix
has been removed from the -mm tree.  Its filename was
     mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix.patch

This patch was dropped because it was folded into mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix

fix bogus fix

Cc: Jia He <jia.he@xxxxxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/memblock.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/memblock.c~mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix
+++ a/mm/memblock.c
@@ -1232,6 +1232,7 @@ int __init_memblock memblock_set_node(ph
 #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
 
 #ifdef CONFIG_HAVE_MEMBLOCK_PFN_VALID
+static int early_region_idx __initdata_memblock = -1;
 unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn)
 {
 	struct memblock_type *type = &memblock.memory;
@@ -1240,7 +1241,6 @@ unsigned long __init_memblock memblock_n
 	uint mid, left = 0;
 	unsigned long start_pfn, end_pfn, next_start_pfn;
 	phys_addr_t addr = PFN_PHYS(++pfn);
-	static int early_region_idx __initdata_memblock = -1;
 
 	/* fast path, return pfn+1 if next pfn is in the same region */
 	if (early_region_idx != -1) {
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

fix-crash-on-ocfs2_duplicate_clusters_by_page-v5-checkpatch-fixes.patch
proc-kcore-fix-invalid-memory-access-in-multi-page-read-optimization-v3-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch
mm.patch
mmpage_alloc-pf_wq_worker-threads-must-sleep-at-should_reclaim_retry-fix.patch
mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn.patch
mm-memblock-introduce-memblock_search_pfn_regions-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux