kvm: Move srcu_struct fields to end of struct kvm

Parallelizing SRCU callback handling will increase the size of
srcu_struct, which will move the kvm structure's kvm_arch field out
of reach of powerpc's current assembly code, which will result in the
following sort of build error:

arch/powerpc/kvm/book3s_hv_rmhandlers.S:617: Error: operand out of range (0x000000000000b328 is not between 0xffffffffffff8000 and 0x0000000000007fff)

This commit moves the srcu_struct fields in the kvm structure to follow
the kvm_arch field, which will allow powerpc's assembly code to continue
to be able to reach the kvm_arch field.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Michael Ellerman <michaele@au1.ibm.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
[ paulmck: Moved this commit to precede SRCU callback parallelization,
  and reworded the commit log into future tense, all in the name of
  bisectability. ]

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 2c14ad9809da..96c8e29c6442 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -375,8 +375,6 @@ struct kvm {
         struct mutex slots_lock;
         struct mm_struct *mm; /* userspace tied to this vm */
         struct kvm_memslots *memslots[KVM_ADDRESS_SPACE_NUM];
-        struct srcu_struct srcu;
-        struct srcu_struct irq_srcu;
         struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
 
         /*
@@ -429,6 +427,8 @@ struct kvm {
         struct list_head devices;
         struct dentry *debugfs_dentry;
         struct kvm_stat_data **debugfs_stat_data;
+        struct srcu_struct srcu;
+        struct srcu_struct irq_srcu;
 };
 
 #define kvm_err(fmt, ...) \