Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f809e5a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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
parents 3a95ea11 211b3d03

arch/x86/mm/pageattr.c

+11 −0
Original line number Diff line number Diff line
@@ -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: