Skip to contentSkip to conversation

x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest

PATCH In review Kevin Winchester 2 participants 4 messages May 30, 2008 – May 31, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest

Changed the call to find_e820_area_size to pass u64 instead of unsigned long.

---
 arch/x86/mm/init_64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/init_64.c +2 -2
index 83ab7f9..94f73c2 100644
@@ -515,7 +515,7 @@ early_param("memtest", parse_memtest);
 
 static void __init early_memtest(unsigned long start, unsigned long end)
 {
-	unsigned long t_start, t_size;
+	u64 t_start, t_size;
 	unsigned pattern;
 
 	if (!memtest_pattern)
@@ -534,7 +534,7 @@ static void __init early_memtest(unsigned long start, unsigned long end)
 			if (t_start + t_size > end)
 				t_size = end - t_start;
 
-			printk(KERN_CONT "\n  %016lx - %016lx pattern %d",
+			printk(KERN_CONT "\n  %016llx - %016llx pattern %d",
 				t_start, t_start + t_size, pattern);
 
 			memtest(t_start, t_size, pattern);
Signature · 1 line
1.5.5.40.g4cdda
#1 lore raw
Quoted 21 lines · Kevin Winchester

Changed the call to find_e820_area_size to pass u64 instead of unsigned long.

---
 arch/x86/mm/init_64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/init_64.c +1 -1
index 83ab7f9..94f73c2 100644
@@ -515,7 +515,7 @@ early_param("memtest", parse_memtest);
 
 static void __init early_memtest(unsigned long start, unsigned long end)
 {
-	unsigned long t_start, t_size;
+	u64 t_start, t_size;
 	unsigned pattern;
 
 	if (!memtest_pattern)

arch/x86/mm/init_64.c static void __init early_memtest(unsigned long start, unsigned long end) · line 540

Quoted 8 lines
arch/x86/mm/init_64.c +1 -1
@@ -534,7 +534,7 @@ static void __init early_memtest(unsigned long start, unsigned long end)
 			if (t_start + t_size > end)
 				t_size = end - t_start;
 
-			printk(KERN_CONT "\n  %016lx - %016lx pattern %d",
+			printk(KERN_CONT "\n  %016llx - %016llx pattern %d",
 				t_start, t_start + t_size, pattern);
 
 			memtest(t_start, t_size, pattern);

I was so excited about finally figuring out how to create and send a patch with git, that I forgot to mention that this was a warning seen in linux-next, next-20080529.

It was more an experiment in how to send git patches than to "get my name in the kernel history", with which most experienced developers seem to think us newbies are only concerned. I keep hearing that testing trees and fixing warnings and small bugs is the preferred way to make it into development - so I'm giving it a try.

Let me know if there was anything wrong with this submission, or if it is too trivial to bother with.

Signature · 1 line
Kevin Winchester
#2 lore raw
In reply to Kevin Winchester
Quoted 21 lines · Kevin Winchester

Changed the call to find_e820_area_size to pass u64 instead of unsigned long.

---
 arch/x86/mm/init_64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/init_64.c +1 -1
index 83ab7f9..94f73c2 100644
@@ -515,7 +515,7 @@ early_param("memtest", parse_memtest);
 
 static void __init early_memtest(unsigned long start, unsigned long end)
 {
-	unsigned long t_start, t_size;
+	u64 t_start, t_size;
 	unsigned pattern;
 
 	if (!memtest_pattern)

arch/x86/mm/init_64.c static void __init early_memtest(unsigned long start, unsigned long end) · line 540

Quoted 8 lines
arch/x86/mm/init_64.c +1 -1
@@ -534,7 +534,7 @@ static void __init early_memtest(unsigned long start, unsigned long end)
 			if (t_start + t_size > end)
 				t_size = end - t_start;
 
-			printk(KERN_CONT "\n  %016lx - %016lx pattern %d",
+			printk(KERN_CONT "\n  %016llx - %016llx pattern %d",
 				t_start, t_start + t_size, pattern);
 
 			memtest(t_start, t_size, pattern);

I still see this warning on next-20080530 - so I expanded the CC list a little. Did I do this patch right?

Signature · 1 line
Kevin Winchester
Acked-by
#3 lore raw
Quoted 26 lines · Kevin Winchester
Quoted 25 lines · Kevin Winchester

Changed the call to find_e820_area_size to pass u64 instead of unsigned long.

---
 arch/x86/mm/init_64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/init_64.c +1 -1
index 83ab7f9..94f73c2 100644
@@ -515,7 +515,7 @@ early_param("memtest", parse_memtest);
  static void __init early_memtest(unsigned long start, unsigned long end)
 {
-       unsigned long t_start, t_size;
+       u64 t_start, t_size;
       unsigned pattern;
         if (!memtest_pattern)
@@ -534,7 +534,7 @@ static void __init early_memtest(unsigned long start,
 unsigned long end)
                       if (t_start + t_size > end)
                               t_size = end - t_start;
 -                       printk(KERN_CONT "\n  %016lx - %016lx pattern
Quoted 8 lines

arch/x86/mm/init_64.c static void __init early_memtest(unsigned long start,

Quoted 5 lines
arch/x86/mm/init_64.c +1 -0
 %d",
+                       printk(KERN_CONT "\n  %016llx - %016llx pattern
 %d",
                               t_start, t_start + t_size, pattern);
                         memtest(t_start, t_size, pattern);

I still see this warning on next-20080530 - so I expanded the CC list a little. Did I do this patch right?

i had one in local too.