[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-29258cf49eb794f00989fc47da8700759a42778b@git.kernel.org>
Date: Thu, 11 Dec 2014 04:26:28 -0800
From: tip-bot for Xishi Qiu <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: mingo@...nel.org, riel@...hat.com, hpa@...or.com,
linux-kernel@...r.kernel.org, akpm@...ux-foundation.org,
dave@...1.net, tglx@...utronix.de, qiuxishi@...wei.com,
linux-mm@...ck.org
Subject: [tip:x86/urgent] x86/mm: Use min() instead of min_t()
in the e820 printout code
Commit-ID: 29258cf49eb794f00989fc47da8700759a42778b
Gitweb: http://git.kernel.org/tip/29258cf49eb794f00989fc47da8700759a42778b
Author: Xishi Qiu <qiuxishi@...wei.com>
AuthorDate: Wed, 10 Dec 2014 10:09:03 +0800
Committer: Ingo Molnar <mingo@...nel.org>
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@...ux-foundation.org>
Signed-off-by: Xishi Qiu <qiuxishi@...wei.com>
Cc: Linux MM <linux-mm@...ck.org>
Cc: <dave@...1.net>
Cc: Rik van Riel <riel@...hat.com>
Link: http://lkml.kernel.org/r/5487AB3F.7050807@huawei.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists