summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-11 12:04:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-11 12:04:51 -0700
commitf809e5a21f05b4aaeef0f9b191c01438d392fa5a (patch)
tree57e9939d395e4d4e9bc36422a70e9e853141391b
parent3a95ea1155c5d44aa58dde2f64f0ddafe27fd1fb (diff)
parent211b3d03c7400f48a781977a50104c9d12f4e229 (diff)
downloadblackbird-op-linux-f809e5a21f05b4aaeef0f9b191c01438d392fa5a.tar.gz
blackbird-op-linux-f809e5a21f05b4aaeef0f9b191c01438d392fa5a.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: work around Fedora-11 x86-32 kernel failures on Intel Atom CPUs
-rw-r--r--arch/x86/mm/pageattr.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 7be47d1a97e4..7233bd7e357b 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -515,6 +515,17 @@ static int split_large_page(pte_t *kpte, unsigned long address)
* primary protection behavior:
*/
__set_pmd_pte(kpte, address, mk_pte(base, __pgprot(_KERNPG_TABLE)));
+
+ /*
+ * Intel Atom errata AAH41 workaround.
+ *
+ * The real fix should be in hw or in a microcode update, but
+ * we also probabilistically try to reduce the window of having
+ * a large TLB mixed with 4K TLBs while instruction fetches are
+ * going on.
+ */
+ __flush_tlb_all();
+
base = NULL;
out_unlock:
OpenPOWER on IntegriCloud