From ab9a802797e845bbcd6938fcf51cb81bc08ccf1d Mon Sep 17 00:00:00 2001 From: Alexander Holler Date: Sat, 16 Feb 2013 16:38:17 +0100 Subject: [PATCH] --- yaml --- r: 350231 b: refs/heads/master c: 20bf062c6575e162ede00308ca3a5714ca112009 h: refs/heads/master i: 350229: 1271cbeb911d7a6f8bd57eaa008e51fe65eea846 350227: 6e5be1d536784dfe63759d34388130791d04c1cb 350223: af22fce439ff477a05ab9e08bea1dce675411c06 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/memtest.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 36e18082e5ba..7b59c61bd339 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9611dc7a8de8a5c6244886dad020995b1a896236 +refs/heads/master: 20bf062c6575e162ede00308ca3a5714ca112009 diff --git a/trunk/arch/x86/mm/memtest.c b/trunk/arch/x86/mm/memtest.c index c80b9fb95734..8dabbed409ee 100644 --- a/trunk/arch/x86/mm/memtest.c +++ b/trunk/arch/x86/mm/memtest.c @@ -9,6 +9,7 @@ #include static u64 patterns[] __initdata = { + /* The first entry has to be 0 to leave memtest with zeroed memory */ 0, 0xffffffffffffffffULL, 0x5555555555555555ULL, @@ -110,15 +111,8 @@ void __init early_memtest(unsigned long start, unsigned long end) return; printk(KERN_INFO "early_memtest: # of tests: %d\n", memtest_pattern); - for (i = 0; i < memtest_pattern; i++) { + for (i = memtest_pattern-1; i < UINT_MAX; --i) { idx = i % ARRAY_SIZE(patterns); do_one_pass(patterns[idx], start, end); } - - if (idx > 0) { - printk(KERN_INFO "early_memtest: wipe out " - "test pattern from memory\n"); - /* additional test with pattern 0 will do this */ - do_one_pass(0, start, end); - } }