tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/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

Linus Torvalds db5dc499 f205b5dc

+2
+2
arch/s390/include/asm/pgtable.h
··· 1051 1051 { 1052 1052 if (!MACHINE_HAS_NX) 1053 1053 pte_val(entry) &= ~_PAGE_NOEXEC; 1054 + if (pte_present(entry)) 1055 + pte_val(entry) &= ~_PAGE_UNUSED; 1054 1056 if (mm_has_pgste(mm)) 1055 1057 ptep_set_pte_at(mm, addr, ptep, entry); 1056 1058 else