Merge tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
Pull powerpc fixes from Michael Ellerman: - fix for mm_dec_nr_pmds() from Scott. - fixes for oopses seen with KVM + THP from Aneesh. - build fixes from Aneesh & Shreyas. * tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error powerpc/mm/thp: Return pte address if we find trans_splitting. powerpc/mm/thp: Make page table walk safe against thp split/collapse KVM: PPC: Remove page table walk helpers KVM: PPC: Use READ_ONCE when dereferencing pte_t pointer powerpc/hugetlb: Call mm_dec_nr_pmds() in hugetlb_free_pmd_range()
No related branches found
No related tags found
Showing
- arch/powerpc/include/asm/kvm_book3s_64.h 6 additions, 11 deletionsarch/powerpc/include/asm/kvm_book3s_64.h
- arch/powerpc/include/asm/pgtable.h 8 additions, 20 deletionsarch/powerpc/include/asm/pgtable.h
- arch/powerpc/kernel/eeh.c 4 additions, 2 deletionsarch/powerpc/kernel/eeh.c
- arch/powerpc/kernel/io-workarounds.c 5 additions, 5 deletionsarch/powerpc/kernel/io-workarounds.c
- arch/powerpc/kvm/Kconfig 1 addition, 1 deletionarch/powerpc/kvm/Kconfig
- arch/powerpc/kvm/book3s_64_mmu_hv.c 6 additions, 8 deletionsarch/powerpc/kvm/book3s_64_mmu_hv.c
- arch/powerpc/kvm/book3s_hv_rm_mmu.c 47 additions, 39 deletionsarch/powerpc/kvm/book3s_hv_rm_mmu.c
- arch/powerpc/kvm/e500_mmu_host.c 23 additions, 9 deletionsarch/powerpc/kvm/e500_mmu_host.c
- arch/powerpc/mm/hash_utils_64.c 2 additions, 1 deletionarch/powerpc/mm/hash_utils_64.c
- arch/powerpc/mm/hugetlbpage.c 21 additions, 11 deletionsarch/powerpc/mm/hugetlbpage.c
- arch/powerpc/perf/callchain.c 14 additions, 10 deletionsarch/powerpc/perf/callchain.c
Loading
Please register or sign in to comment