Commit-ID: 29258cf49eb794f00989fc47da8700759a42778b Gitweb: http://git.kernel.org/tip/29258cf49eb794f00989fc47da8700759a42778b Author: Xishi Qiu <qiuxishi@xxxxxxxxxx> AuthorDate: Wed, 10 Dec 2014 10:09:03 +0800 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Thu, 11 Dec 2014 11:35:02 +0100 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@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Xishi Qiu <qiuxishi@xxxxxxxxxx> Cc: Linux MM <linux-mm@xxxxxxxxx> Cc: <dave@xxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Link: http://lkml.kernel.org/r/5487AB3F.7050807@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/kernel/e820.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 49f8864..dd2f07a 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -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; } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>