From: Alex Shi Date: Thu, 2 Jun 2016 04:18:55 +0000 (+0800) Subject: Merge tag 'v4.4.12' into linux-linaro-lsk-v4.4 X-Git-Tag: firefly_0821_release~176^2~4^2~43 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37aa27cffb68b92b8f42d1a9f6300ed758d07552;p=firefly-linux-kernel-4.4.55.git Merge tag 'v4.4.12' into linux-linaro-lsk-v4.4 This is the 4.4.12 stable release --- 37aa27cffb68b92b8f42d1a9f6300ed758d07552 diff --cc arch/arm64/include/asm/pgtable.h index c3c2518eecfe,67c2ad6d33b7..9a09ccf7122d --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@@ -354,10 -354,9 +355,10 @@@ void pmdp_splitting_flush(struct vm_are #define pmd_mksplitting(pmd) pte_pmd(pte_mkspecial(pmd_pte(pmd))) #define pmd_mkold(pmd) pte_pmd(pte_mkold(pmd_pte(pmd))) #define pmd_mkwrite(pmd) pte_pmd(pte_mkwrite(pmd_pte(pmd))) +#define pmd_mkclean(pmd) pte_pmd(pte_mkclean(pmd_pte(pmd))) #define pmd_mkdirty(pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd))) #define pmd_mkyoung(pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd))) - #define pmd_mknotpresent(pmd) (__pmd(pmd_val(pmd) & ~PMD_TYPE_MASK)) + #define pmd_mknotpresent(pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID)) #define __HAVE_ARCH_PMD_WRITE #define pmd_write(pmd) pte_write(pmd_pte(pmd))