diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-07-06 14:15:06 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-07-06 14:15:06 +0200 |
| commit | f3551520416978111b422b7c177f6f1f6d75ff62 (patch) | |
| tree | 8ffb520116aab94ea6db75176a946d62e34efc83 /arch/arm64/mm | |
| parent | arm64: insn: Don't fallback on nosync path for general insn patching (diff) | |
| parent | x86/mm: Add TLB purge to free pmd/pte page interfaces (diff) | |
| download | linux-f3551520416978111b422b7c177f6f1f6d75ff62.tar.xz linux-f3551520416978111b422b7c177f6f1f6d75ff62.zip | |
Merge branch 'x86/mm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into aarch64/for-next/core
Pull in core ioremap changes from -tip, since we depend on these for
re-enabling huge I/O mappings on arm64.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 493ff75670ff..8ae5d7ae4af3 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -977,12 +977,12 @@ int pmd_clear_huge(pmd_t *pmdp) return 1; } -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return pud_none(*pud); } -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return pmd_none(*pmd); } |