Merge branch 'topic/ppc-kvm' into next

Merge in some commits we're sharing with the KVM tree.

I manually propagated the change from commit d3d4ffaae439
("powerpc/powernv/ioda2: Reduce upper limit for DMA window size") into
pci-ioda-tce.c.

Conflicts:
        arch/powerpc/include/asm/cputable.h
        arch/powerpc/platforms/powernv/pci-ioda.c
        arch/powerpc/platforms/powernv/pci.h

1 files changed, 0 insertions, 5 deletions

diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 6d34bd71139d..4e9cede5a7e7 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -187,11 +187,6 @@ struct paca_struct {
         u8 subcore_sibling_mask;
         /* Flag to request this thread not to stop */
         atomic_t dont_stop;
-        /*
-         * Pointer to an array which contains pointer
-         * to the sibling threads' paca.
-         */
-        struct paca_struct **thread_sibling_pacas;
         /* The PSSCR value that the kernel requested before going to stop */
         u64 requested_psscr;