Commit db5dc499 authored Apr 20, 2017 by Linus Torvalds

linux

Pull s390 fix from Martin Schwidefsky:
 "There is one more fix I would like to see in 4.11: The combination of
  KVM, CMMA and heavy paging can cause data corruption, the fix is to
  clear the _PAGE_UNUSED bit in set_pte_at()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: fix CMMA vs KSM vs others

parents f205b5dc a8f60d1f

arch/s390/include/asm/pgtable.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1051,6 +1051,8 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
		{
		if (!MACHINE_HAS_NX)
		pte_val(entry) &= ~_PAGE_NOEXEC;
		if (pte_present(entry))
		pte_val(entry) &= ~_PAGE_UNUSED;
		if (mm_has_pgste(mm))
		ptep_set_pte_at(mm, addr, ptep, entry);
		else