x86: memtest: use pointers of equal type for comparison
authorThomas Gleixner <tglx@linutronix.de>
Thu, 11 Jun 2009 14:25:01 +0000 (16:25 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 11 Jun 2009 14:26:35 +0000 (16:26 +0200)
Commit c9690998ef48ffefeccb91c70a7739eebdea57f9 (x86: memtest: remove
64-bit division) introduced following compile warning:

arch/x86/mm/memtest.c: In function 'memtest':
arch/x86/mm/memtest.c:56: warning: comparison of distinct pointer types lacks a cast
arch/x86/mm/memtest.c:58: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/mm/memtest.c

index c0bedcd..18d244f 100644 (file)
@@ -40,21 +40,20 @@ static void __init reserve_bad_mem(u64 pattern, u64 start_bad, u64 end_bad)
 
 static void __init memtest(u64 pattern, u64 start_phys, u64 size)
 {
-       u64 *p;
-       void *start, *end;
+       u64 *p, *start, *end;
        u64 start_bad, last_bad;
        u64 start_phys_aligned;
-       size_t incr;
+       const size_t incr = sizeof(pattern);
 
-       incr = sizeof(pattern);
        start_phys_aligned = ALIGN(start_phys, incr);
        start = __va(start_phys_aligned);
-       end = start + size - (start_phys_aligned - start_phys);
+       end = start + (size - (start_phys_aligned - start_phys)) / incr;
        start_bad = 0;
        last_bad = 0;
 
        for (p = start; p < end; p++)
                *p = pattern;
+
        for (p = start; p < end; p++, start_phys_aligned += incr) {
                if (*p == pattern)
                        continue;