From dc986c6f554ea8cfb01ce17f2910a3e10acbff7f Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Tue, 15 Jul 2008 00:03:44 -0700 Subject: [PATCH] --- yaml --- r: 104371 b: refs/heads/master c: caadbdce240c43e3e46c82fce6c00eb7f01e1beb h: refs/heads/master i: 104369: 1d4668479a7f86fb76aa1fe59a3400f326b8dd9d 104367: b765c1f080e0ea1584594018d211da8873d70314 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 2 +- trunk/arch/x86/Kconfig | 1 - trunk/arch/x86/mm/init_32.c | 3 +++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c0042c521411..8ddae0fc0521 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f067167a83d1c7f80437fd1d32b55508aaca009 +refs/heads/master: caadbdce240c43e3e46c82fce6c00eb7f01e1beb diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 09ad7450647b..70624ddd1df3 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1206,7 +1206,7 @@ and is between 256 and 4096 characters. It is defined in the file or memmap=0x10000$0x18690000 - memtest= [KNL,X86_64] Enable memtest + memtest= [KNL,X86] Enable memtest Format: range: 0,4 : pattern number default : 0 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 96e0c2ebc388..03980cb04291 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -447,7 +447,6 @@ config PARAVIRT_DEBUG config MEMTEST bool "Memtest" - depends on X86_64 help This option adds a kernel parameter 'memtest', which allows memtest to be set. diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c index 9689a5138e64..3eeab6d0065f 100644 --- a/trunk/arch/x86/mm/init_32.c +++ b/trunk/arch/x86/mm/init_32.c @@ -844,6 +844,9 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, reserve_early(table_start << PAGE_SHIFT, table_end << PAGE_SHIFT, "PGTABLE"); + if (!after_init_bootmem) + early_memtest(start, end); + return end >> PAGE_SHIFT; }