Commit 29258cf4 authored Dec 10, 2014 by Xishi Qiu Committed by Ingo Molnar Dec 11, 2014

x86/mm: Use min() instead of min_t() in the e820 printout code



The type of "MAX_DMA_PFN" and "xXx_pfn" are both unsigned long
now, so use min() instead of min_t().

Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Cc: Linux MM <linux-mm@kvack.org>
Cc: <dave@sr71.net>
Cc: Rik van Riel <riel@redhat.com>
Link: http://lkml.kernel.org/r/5487AB3F.7050807@huawei.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent c072b90c

arch/x86/kernel/e820.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1114,8 +1114,8 @@ void __init memblock_find_dma_reserve(void)
		* at first, and assume boot_mem will not take below MAX_DMA_PFN
		*/
		for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
		start_pfn = min_t(unsigned long, start_pfn, MAX_DMA_PFN);
		end_pfn = min_t(unsigned long, end_pfn, MAX_DMA_PFN);
		start_pfn = min(start_pfn, MAX_DMA_PFN);
		end_pfn = min(end_pfn, MAX_DMA_PFN);
		nr_pages += end_pfn - start_pfn;
		}