1 files changed, 9 insertions, 0 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 41ead8d3bc0b..235cfd39e0d7 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -879,6 +879,15 @@ void __init setup_arch(char **cmdline_p)
                         KERNEL_PGD_PTRS);
 
         load_cr3(swapper_pg_dir);
+        /*
+         * Note: Quark X1000 CPUs advertise PGE incorrectly and require
+         * a cr3 based tlb flush, so the following __flush_tlb_all()
+         * will not flush anything because the cpu quirk which clears
+         * X86_FEATURE_PGE has not been invoked yet. Though due to the
+         * load_cr3() above the TLB has been flushed already. The
+         * quirk is invoked before subsequent calls to __flush_tlb_all()
+         * so proper operation is guaranteed.
+         */
         __flush_tlb_all();
 #else
         printk(KERN_INFO "Command line: %s\n", boot_command_line);