Commit 379b03b7 authored Mar 09, 2018 by Daniel Vacek Committed by Linus Torvalds Mar 09, 2018

mm/memblock.c: hardcode the end_pfn being -1

This is just a cleanup.  It aids handling the special end case in the
next commit.

[akpm@linux-foundation.org: make it work against current -linus, not against -mm]
[akpm@linux-foundation.org: make it work against current -linus, not against -mm some more]
Link: http://lkml.kernel.org/r/1ca478d4269125a99bcfb1ca04d7b88ac1aee924.1520011944.git.neelx@redhat.com


Signed-off-by: Daniel Vacek <neelx@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Pavel Tatashin <pasha.tatashin@oracle.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 96312e61

mm/memblock.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1107,7 +1107,7 @@ unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn,
		struct memblock_type *type = &memblock.memory;
		unsigned int right = type->cnt;
		unsigned int mid, left = 0;
		phys_addr_t addr = PFN_PHYS(pfn + 1);
		phys_addr_t addr = PFN_PHYS(++pfn);

		do {
		mid = (right + left) / 2;
		@@ -1118,15 +1118,15 @@ unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn,
		type->regions[mid].size))
		left = mid + 1;
		else {
		/* addr is within the region, so pfn + 1 is valid */
		return min(pfn + 1, max_pfn);
		/* addr is within the region, so pfn is valid */
		return pfn;
		}
		} while (left < right);

		if (right == type->cnt)
		return max_pfn;
		return -1UL;
		else
		return min(PHYS_PFN(type->regions[right].base), max_pfn);
		return PHYS_PFN(type->regions[right].base);
		}

		/**

Admin message