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

Commit ef161a98 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

mm: mminit_validate_memmodel_limits(): remove redundant test 



In case if start_pfn overlap the upper bound no need to test end_pfn again
since we have it already trimmed.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Reviewed-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0f043a81

mm/sparse.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -164,9 +164,7 @@ void __meminit mminit_validate_memmodel_limits(unsigned long *start_pfn, 
		WARN_ON_ONCE(1);

		WARN_ON_ONCE(1);

		*start_pfn = max_sparsemem_pfn;

		*start_pfn = max_sparsemem_pfn;

		*end_pfn = max_sparsemem_pfn;

		*end_pfn = max_sparsemem_pfn;

	}

	} else if (*end_pfn > max_sparsemem_pfn) {



	if (*end_pfn > max_sparsemem_pfn) {

		mminit_dprintk(MMINIT_WARNING, "pfnvalidation",

		mminit_dprintk(MMINIT_WARNING, "pfnvalidation",

			"End of range %lu -> %lu exceeds SPARSEMEM max %lu\n",

			"End of range %lu -> %lu exceeds SPARSEMEM max %lu\n",

			*start_pfn, *end_pfn, max_sparsemem_pfn);

			*start_pfn, *end_pfn, max_sparsemem_pfn);