Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

Browse source

This merges in the commits in the topic/ppc-kvm branch of the powerpc
tree to get the changes to arch/powerpc which subsequent patches will
rely on.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

...

This commit is contained in:

Paul Mackerras 2017-04-20 11:38:33 +10:00

parent 3762d45aa7 e5afdf9dd5

commit 644d2d6fef

9 changed files with 142 additions and 21 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

12

arch/powerpc/include/asm/iommu.h

View file

4

arch/powerpc/include/asm/mmu_context.h

View file

54

arch/powerpc/kernel/iommu.c

View file

39

arch/powerpc/mm/mmu_context_iommu.c

View file

46

arch/powerpc/platforms/powernv/pci-ioda.c

View file

1

arch/powerpc/platforms/powernv/pci.c

View file

3

arch/powerpc/platforms/pseries/iommu.c

View file

2

arch/powerpc/platforms/pseries/vio.c

View file

2

drivers/vfio/vfio_iommu_spapr_tce.c

View file