aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXishi Qiu <qiuxishi@huawei.com>2014-12-09 21:09:03 -0500
committerIngo Molnar <mingo@kernel.org>2014-12-11 05:35:02 -0500
commit29258cf49eb794f00989fc47da8700759a42778b (patch)
tree2cb1585a4b3c895bcb7e0a068e25ddee38df175d
parentc072b90c8dfe135072f646cc50b826e30c5aa558 (diff)
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>
-rw-r--r--arch/x86/kernel/e820.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 49f886481615..dd2f07ae9d0c 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1114,8 +1114,8 @@ void __init memblock_find_dma_reserve(void)
1114 * at first, and assume boot_mem will not take below MAX_DMA_PFN 1114 * at first, and assume boot_mem will not take below MAX_DMA_PFN
1115 */ 1115 */
1116 for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) { 1116 for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
1117 start_pfn = min_t(unsigned long, start_pfn, MAX_DMA_PFN); 1117 start_pfn = min(start_pfn, MAX_DMA_PFN);
1118 end_pfn = min_t(unsigned long, end_pfn, MAX_DMA_PFN); 1118 end_pfn = min(end_pfn, MAX_DMA_PFN);
1119 nr_pages += end_pfn - start_pfn; 1119 nr_pages += end_pfn - start_pfn;
1120 } 1120 }
1121 1121