]> err.no Git - linux-2.6/commitdiff
x86: fix an incompatible pointer type warning on 64-bit compilations
authorDavid Howells <dhowells@redhat.com>
Sat, 7 Jun 2008 16:18:40 +0000 (17:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 12 Jun 2008 19:27:15 +0000 (21:27 +0200)
Fix an incompatible pointer type warning on x86_64 compilations.
early_memtest() is passing a u64* to find_e820_area_size() which is expecting
an unsigned long.  Change t_start and t_size to unsigned long as those are
also 64-bit types on x88_64.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/init_64.c

index 156e6d7b0e329cd84b06342dffd37e46ec28ac9a..998a06ea5f7d17b2d5172ab14df80a0d5e7d4b93 100644 (file)
@@ -506,7 +506,7 @@ early_param("memtest", parse_memtest);
 
 static void __init early_memtest(unsigned long start, unsigned long end)
 {
-       u64 t_start, t_size;
+       unsigned long t_start, t_size;
        unsigned pattern;
 
        if (!memtest_pattern)
@@ -525,7 +525,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  %016llx - %016llx pattern %d",
+                       printk(KERN_CONT "\n  %016lx - %016lx pattern %d",
                                t_start, t_start + t_size, pattern);
 
                        memtest(t_start, t_size, pattern);