Messages in this thread Patch in this message | | | Date | Thu, 11 Jun 2009 17:07:12 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL] x86 fixlet |
| |
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
A build warning on 32-bit slipped through (on a default-disabled config).
Thanks,
Ingo
------------------> Thomas Gleixner (1): x86: memtest: use pointers of equal type for comparison
arch/x86/mm/memtest.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c index c0bedcd..18d244f 100644 --- a/arch/x86/mm/memtest.c +++ b/arch/x86/mm/memtest.c @@ -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;
| |