Commit 355e30ca authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Heiko Carstens
Browse files

s390/mm: remove redundant check against VMEM_MAX_PHYS 



The value of ident_map_size could never exceed the value of
vmemmap as secured by setup_kernel_memory_layout() function:

	/* make sure identity map doesn't overlay with vmemmap */
	ident_map_size = min(ident_map_size, vmemmap_start);

Since VMEM_MAX_PHYS macro is set to vmemmap and a newly added
range is checked against ident_map_size in add_memory_merged()
function anyway, the check against VMEM_MAX_PHYS is redundant.

Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 3b53d7b1

drivers/s390/char/sclp_cmd.c

+0 −4
Original line number Diff line number Diff line
@@ -392,10 +392,6 @@ static void __init add_memory_merged(u16 rn) 
		goto skip_add;

	start = rn2addr(first_rn);

	size = (unsigned long long) num * sclp.rzm;

	if (start >= VMEM_MAX_PHYS)

		goto skip_add;

	if (start + size > VMEM_MAX_PHYS)

		size = VMEM_MAX_PHYS - start;

	if (start >= ident_map_size)

		goto skip_add;

	if (start + size > ident_map_size)