x86/mm: use min instead of min_t

PATCH In review Xishi Qiu 3 participants 3 messages Dec 10, 2014 – Dec 11, 2014

Subsystems (2)

Memory management x86

lore

Share & tools

lore

Xishi Qiu

author

2014-12-10 02:09 UTC #0 lore raw

PATCH v3 2/2 x86/mm: use min instead of min_t

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

Signed-off-by Xishi Qiu <[email protected]>

---
 arch/x86/kernel/e820.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/x86/kernel/e820.c +2 -2

index 49f8864..dd2f07a 100644
@@ -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;
 	}

Signature · 1 line

2.0.0

Ingo Molnar

2014-12-10 06:55 UTC #1 lore raw

Quoted 14 lines · Xishi Qiu

The type of "MAX_DMA_PFN" and "xXx_pfn" are both unsigned long now, so use min() instead of min_t().
Signed-off-by Xishi Qiu <[email protected]>
Suggested-by Andrew Morton <[email protected]>
---
 arch/x86/kernel/e820.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/e820.c +0 -0
index 49f8864..dd2f07a 100644

arch/x86/kernel/e820.c void __init memblock_find_dma_reserve(void) · line 1119

Quoted 8 lines

arch/x86/kernel/e820.c +2 -2

@@ -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;

Yes, harmonizing the types is a much nicer solution, it allows cleanups like this.

Thanks,

Ingo

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

tip-bot for Xishi Qiu

merge bot

2014-12-11 12:26 UTC #2 lore raw

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

In reply to Xishi Qiu

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 <[email protected]>
AuthorDate: Wed, 10 Dec 2014 10:09:03 +0800
Committer:  Ingo Molnar <[email protected]>
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().

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] open here

Signed-off-by Ingo Molnar <[email protected]>

---
 arch/x86/kernel/e820.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/x86/kernel/e820.c +2 -2

index 49f8864..dd2f07a 100644
@@ -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;
 	}