Merge branch 'kvm-ppc-fixes' of paulus/powerpc into topic/ppc-kvm

Browse source

Some commits we'd like to share between the powerpc and kvm-ppc tree for
next have dependencies on commits that went into 4.19 via the
kvm-ppc-fixes branch and weren't merged before 4.19-rc3, which is our
base commit.

So merge the kvm-ppc-fixes branch into topic/ppc-kvm.

...

This commit is contained in:

Michael Ellerman 2018-10-02 23:02:35 +10:00

parent 11da3a7f84 71d29f43b6

commit b66081e25e

8 changed files with 99 additions and 143 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/powerpc/include/asm/book3s/64/pgtable.h

View file

2

arch/powerpc/include/asm/iommu.h

View file

1

arch/powerpc/include/asm/mmu_context.h

View file

25

arch/powerpc/kernel/iommu.c

View file

91

arch/powerpc/kvm/book3s_64_mmu_radix.c

View file

39

arch/powerpc/kvm/book3s_64_vio_hv.c

View file

49

arch/powerpc/mm/init_64.c

View file

34

arch/powerpc/mm/mmu_context_iommu.c

View file