diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2017-09-07 19:29:01 +0300 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-09-07 19:29:01 +0300 |
commit | 78809a68490d84eb632a215be2121d4b44c86954 (patch) | |
tree | 38b528832a0f1eba921f443ff661969bfb516cc8 /arch/powerpc/kernel/eeh.c | |
parent | 082d3900a446283a6ec15917a1682db2cdf17621 (diff) | |
parent | 43f6b0cfb2e4dfd5aa452a1d44491e805e37b7da (diff) | |
download | linux-78809a68490d84eb632a215be2121d4b44c86954.tar.xz |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
KVM/PPC update for 4.14
There are various minor fixes and cleanups. The only new feature is
that we now export information about storage key support to userspace,
so it can advertise it to the guest.
I have pulled in Michael Ellerman's topic/ppc-kvm branch from the
powerpc tree to get a couple of fixes that touch both KVM PPC code and
other PPC code. That's why there is some arch/powerpc stuff in the
diffstat that isn't arch/powerpc/kvm.
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
-rw-r--r-- | arch/powerpc/kernel/eeh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 63992b2d8e15..5e6887c40528 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -44,6 +44,7 @@ #include <asm/machdep.h> #include <asm/ppc-pci.h> #include <asm/rtas.h> +#include <asm/pte-walk.h> /** Overview: @@ -352,8 +353,7 @@ static inline unsigned long eeh_token_to_phys(unsigned long token) * worried about _PAGE_SPLITTING/collapse. Also we will not hit * page table free, because of init_mm. */ - ptep = __find_linux_pte_or_hugepte(init_mm.pgd, token, - NULL, &hugepage_shift); + ptep = find_init_mm_pte(token, &hugepage_shift); if (!ptep) return token; WARN_ON(hugepage_shift); |