aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXishi Qiu <[email protected]>2014-12-10 10:09:03 +0800
committerIngo Molnar <[email protected]>2014-12-11 11:35:02 +0100
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 <[email protected]> Signed-off-by: Xishi Qiu <[email protected]> Cc: Linux MM <[email protected]> Cc: <[email protected]> Cc: Rik van Riel <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
-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)
* 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;
}