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

Commit b8fd39c0 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86, mm: Use clamp_t() in init_range_memory_mapping



save some lines, and make code more readable.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-42-git-send-email-yinghai@kernel.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 60a8f428
Loading
Loading
Loading
Loading
+5 −16
Original line number Diff line number Diff line
@@ -357,31 +357,20 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
 * would have hole in the middle or ends, and only ram parts will be mapped.
 */
static unsigned long __init init_range_memory_mapping(
					   unsigned long range_start,
					   unsigned long range_end)
					   unsigned long r_start,
					   unsigned long r_end)
{
	unsigned long start_pfn, end_pfn;
	unsigned long mapped_ram_size = 0;
	int i;

	for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
		u64 start = (u64)start_pfn << PAGE_SHIFT;
		u64 end = (u64)end_pfn << PAGE_SHIFT;

		if (end <= range_start)
			continue;

		if (start < range_start)
			start = range_start;

		if (start >= range_end)
		u64 start = clamp_val(PFN_PHYS(start_pfn), r_start, r_end);
		u64 end = clamp_val(PFN_PHYS(end_pfn), r_start, r_end);
		if (start >= end)
			continue;

		if (end > range_end)
			end = range_end;

		init_memory_mapping(start, end);

		mapped_ram_size += end - start;
	}