diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 23:14:17 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 23:14:17 +1000 |
commit | 8434f0892ee85504a230a0e402c569774a8d0c42 (patch) | |
tree | a8bc1734a06a1c57bd797220a99514e70ec72f93 /arch/powerpc/mm/hash_utils_64.c | |
parent | 6acdc9a6bad9f23771d24baca763141a24ead6cb (diff) | |
parent | 94171b19c3f1f4d9d4c0e3aaa1aa161def1ec7ea (diff) | |
download | linux-stable-8434f0892ee85504a230a0e402c569774a8d0c42.tar.gz linux-stable-8434f0892ee85504a230a0e402c569774a8d0c42.tar.bz2 linux-stable-8434f0892ee85504a230a0e402c569774a8d0c42.zip |
Merge branch 'topic/ppc-kvm' into next
Bring in the commit to rename find_linux_pte_or_hugepte() which touches
arch and KVM code, and might need to be merged with the kvmppc tree to
avoid conflicts.
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
-rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 867ddacc1213..1c4cd82421bc 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -61,6 +61,7 @@ #include <asm/tm.h> #include <asm/trace.h> #include <asm/ps3.h> +#include <asm/pte-walk.h> #ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt) @@ -1298,7 +1299,7 @@ int hash_page_mm(struct mm_struct *mm, unsigned long ea, #endif /* CONFIG_PPC_64K_PAGES */ /* Get PTE and page size from page tables */ - ptep = __find_linux_pte_or_hugepte(pgdir, ea, &is_thp, &hugeshift); + ptep = find_linux_pte(pgdir, ea, &is_thp, &hugeshift); if (ptep == NULL || !pte_present(*ptep)) { DBG_LOW(" no PTE !\n"); rc = 1; @@ -1527,7 +1528,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, * THP pages use update_mmu_cache_pmd. We don't do * hash preload there. Hence can ignore THP here */ - ptep = find_linux_pte_or_hugepte(pgdir, ea, NULL, &hugepage_shift); + ptep = find_current_mm_pte(pgdir, ea, NULL, &hugepage_shift); if (!ptep) goto out_exit; |