diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 15:17:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 15:17:34 +1100 |
| commit | 4309a225f1c7d61fee30f57787aeb305e0304f03 (patch) | |
| tree | b94ce279bbabed98c38f03e9f57f03d493c73a5a /arch/arm64 | |
| parent | eacad2d588a3243cc8523e056c017ac875b64c88 (diff) | |
| parent | d07b956c650ad58a8ce00517515ebaf962e1f5c7 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
Documentation/kasan.txt
arch/powerpc/kernel/time.c
arch/x86/Kconfig
drivers/block/zram/zram_drv.c
drivers/rtc/Makefile
include/linux/mm.h
init/Kconfig
kernel/fork.c
lib/Makefile
mm/filemap_xip.c
mm/slab_common.c
mm/slub.c
mm/swap.c
mm/vmscan.c
scripts/Makefile.kasan
scripts/module-common.lds
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 16449c535e5..a26a5740afc 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -285,10 +285,12 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address, #define pmd_dirty(pmd) pte_dirty(pmd_pte(pmd)) #define pmd_young(pmd) pte_young(pmd_pte(pmd)) +#define pmd_dirty(pmd) pte_dirty(pmd_pte(pmd)) #define pmd_wrprotect(pmd) pte_pmd(pte_wrprotect(pmd_pte(pmd))) #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)) |