Commit 77c9622d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'memblock-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock 

Pull memblock update from Mike Rapoport:
 "Code readability improvement.

  Use NUMA_NO_NODE instead of -1 as return value of
  memblock_search_pfn_nid() to improve code readability
  and consistency with the callers of that function"

* tag 'memblock-v6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: Return NUMA_NO_NODE instead of -1 to improve code readability
parents 0b7359cc 2159bd4e

mm/memblock.c

+1 −1
Original line number Diff line number Diff line
@@ -1885,7 +1885,7 @@ int __init_memblock memblock_search_pfn_nid(unsigned long pfn, 
	int mid = memblock_search(type, PFN_PHYS(pfn));



	if (mid == -1)

		return -1;

		return NUMA_NO_NODE;



	*start_pfn = PFN_DOWN(type->regions[mid].base);

	*end_pfn = PFN_DOWN(type->regions[mid].base + type->regions[mid].size);