Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86/debug changes from Ingo Molnar:
 "Two init annotations and a built-in memtest speedup"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/memtest: Shorten time for tests
  x86: Convert a few mistaken __cpuinit annotations to __init
  x86/EFI: Properly init-annotate BGRT code

1 files changed, 2 insertions, 8 deletions

diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c
index c80b9fb95734..8dabbed409ee 100644
--- a/arch/x86/mm/memtest.c
+++ b/arch/x86/mm/memtest.c
@@ -9,6 +9,7 @@
 #include <linux/memblock.h>
 
 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);
-        }
 }