diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 15:14:17 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 15:14:17 +0200 |
| commit | 8434f0892ee85504a230a0e402c569774a8d0c42 (patch) | |
| tree | a8bc1734a06a1c57bd797220a99514e70ec72f93 /arch/powerpc/include/asm/pgtable.h | |
| parent | powerpc/bpf: Use memset32() to pre-fill traps in BPF page(s) (diff) | |
| parent | powerpc/mm: Rename find_linux_pte_or_hugepte() (diff) | |
| download | linux-8434f0892ee85504a230a0e402c569774a8d0c42.tar.xz linux-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/include/asm/pgtable.h')
| -rw-r--r-- | arch/powerpc/include/asm/pgtable.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index ab7f44475b1f..7d0d38f58243 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -66,16 +66,8 @@ extern int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, #ifndef CONFIG_TRANSPARENT_HUGEPAGE #define pmd_large(pmd) 0 #endif -pte_t *__find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, - bool *is_thp, unsigned *shift); -static inline pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, - bool *is_thp, unsigned *shift) -{ - VM_WARN(!arch_irqs_disabled(), - "%s called with irq enabled\n", __func__); - return __find_linux_pte_or_hugepte(pgdir, ea, is_thp, shift); -} +/* can we use this in kvm */ unsigned long vmalloc_to_phys(void *vmalloc_addr); void pgtable_cache_add(unsigned shift, void (*ctor)(void *)); |