Merge branch 'topic/ppc-kvm' into next

Browse source

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.

...

This commit is contained in:

Michael Ellerman 2017-08-17 23:14:17 +10:00

parent 6acdc9a6ba 94171b19c3

commit 8434f0892e

13 changed files with 103 additions and 55 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

10

arch/powerpc/include/asm/pgtable.h

View file

35

arch/powerpc/include/asm/pte-walk.h

View file

4

arch/powerpc/kernel/eeh.c

View file

5

arch/powerpc/kernel/io-workarounds.c

View file

5

arch/powerpc/kvm/book3s_64_mmu_hv.c

View file

28

arch/powerpc/kvm/book3s_64_mmu_radix.c

View file

12

arch/powerpc/kvm/book3s_64_vio_hv.c

View file

18

arch/powerpc/kvm/book3s_hv_rm_mmu.c

View file

3

arch/powerpc/kvm/e500_mmu_host.c

View file

5

arch/powerpc/mm/hash_utils_64.c

View file

24

arch/powerpc/mm/hugetlbpage.c

View file

6

arch/powerpc/mm/tlb_hash64.c

View file

3

arch/powerpc/perf/callchain.c

View file