]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/paca' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 30 Mar 2018 13:11:24 +0000 (00:11 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 30 Mar 2018 22:09:36 +0000 (09:09 +1100)
commitbcff0267c065226fa911553cb33843afe9eedf4c
treed1593fe45c0341f88eecd26568bb913ac74c64a1
parent10b344222f90c880067984948b56e1f13697dd29
parenta1e31f811ee2a1d49aef5d7e483ab5da87a6c280
Merge branch 'topic/paca' into next

Bring in yet another series that touches KVM code, and might need to
be merged into the kvm-ppc branch to resolve conflicts.

This required some changes in pnv_power9_force_smt4_catch/release()
due to the paca array becomming an array of pointers.
24 files changed:
arch/powerpc/include/asm/book3s/64/hash.h
arch/powerpc/include/asm/paca.h
arch/powerpc/include/asm/setup.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/paca.c
arch/powerpc/kernel/prom.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/sysfs.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/mem.c
arch/powerpc/mm/numa.c
arch/powerpc/mm/pgtable-book3s64.c
arch/powerpc/mm/pgtable-radix.c
arch/powerpc/mm/tlb-radix.c
arch/powerpc/platforms/powernv/idle.c
arch/powerpc/platforms/powernv/setup.c
arch/powerpc/platforms/pseries/hotplug-cpu.c
arch/powerpc/platforms/pseries/lpar.c
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/platforms/pseries/smp.c
arch/powerpc/xmon/xmon.c