Commit d3f3c934 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

x86: Disable CLFLUSH support again

It turns out CLFLUSH support is still not complete; we
flush the wrong pages.  Again disable it for the release.
Noticed by Jan Beulich who then also noticed a stupid typo later.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3f3f7b74
...@@ -82,7 +82,7 @@ static void flush_kernel_map(void *arg) ...@@ -82,7 +82,7 @@ static void flush_kernel_map(void *arg)
struct page *p; struct page *p;
/* High level code is not ready for clflush yet */ /* High level code is not ready for clflush yet */
if (cpu_has_clflush) { if (0 && cpu_has_clflush) {
list_for_each_entry (p, lh, lru) list_for_each_entry (p, lh, lru)
cache_flush_page(p); cache_flush_page(p);
} else if (boot_cpu_data.x86_model >= 4) } else if (boot_cpu_data.x86_model >= 4)
......
...@@ -75,7 +75,8 @@ static void flush_kernel_map(void *arg) ...@@ -75,7 +75,8 @@ static void flush_kernel_map(void *arg)
/* When clflush is available always use it because it is /* When clflush is available always use it because it is
much cheaper than WBINVD. */ much cheaper than WBINVD. */
if (!cpu_has_clflush) /* clflush is still broken. Disable for now. */
if (1 || !cpu_has_clflush)
asm volatile("wbinvd" ::: "memory"); asm volatile("wbinvd" ::: "memory");
else list_for_each_entry(pg, l, lru) { else list_for_each_entry(pg, l, lru) {
void *adr = page_address(pg); void *adr = page_address(pg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment