Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0da3764 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm/memblock.c: cast constant ULLONG_MAX to phys_addr_t"

parents 8fec1714 15c3e890

mm/memblock.c

+2 −2
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ void __init_memblock __next_mem_range(u64 *idx, int nid, ulong flags, 
			r = &type_b->regions[idx_b];

			r_start = idx_b ? r[-1].base + r[-1].size : 0;

			r_end = idx_b < type_b->cnt ?

				r->base : ULLONG_MAX;

				r->base : (phys_addr_t)ULLONG_MAX;



			/*

			 * if idx_b advanced past idx_a,
@@ -1045,7 +1045,7 @@ void __init_memblock __next_mem_range_rev(u64 *idx, int nid, ulong flags, 
			r = &type_b->regions[idx_b];

			r_start = idx_b ? r[-1].base + r[-1].size : 0;

			r_end = idx_b < type_b->cnt ?

				r->base : ULLONG_MAX;

				r->base : (phys_addr_t)ULLONG_MAX;

			/*

			 * if idx_b advanced past idx_a,

			 * break out to advance idx_a