Merge tag 'v3.9-rc5' into kvm-arm-next

Linux 3.9-rc5

diff --combined arch/arm/kernel/asm-offsets.c
index 3c09d8c7798b3e0529cf18cba142e57516ba5a80,923eec7105cff3cbb5f1eccd7e044a25e4cfdbf3..ee1ac39a58f0a50b96862a58e45875ed01c75407
--- 1/arch/arm/kernel/asm-offsets.c
--- 2/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@@ -110,7 -110,7 +110,7 @@@ int main(void
    BLANK();
  #endif
  #ifdef CONFIG_CPU_HAS_ASID
-   DEFINE(MM_CONTEXT_ID,               offsetof(struct mm_struct, context.id));
+   DEFINE(MM_CONTEXT_ID,               offsetof(struct mm_struct, context.id.counter));
    BLANK();
  #endif
    DEFINE(VMA_VM_MM,           offsetof(struct vm_area_struct, vm_mm));
@@@ -165,10 -165,10 +165,10 @@@
    DEFINE(VCPU_PC,             offsetof(struct kvm_vcpu, arch.regs.usr_regs.ARM_pc));
    DEFINE(VCPU_CPSR,           offsetof(struct kvm_vcpu, arch.regs.usr_regs.ARM_cpsr));
    DEFINE(VCPU_IRQ_LINES,      offsetof(struct kvm_vcpu, arch.irq_lines));
 -  DEFINE(VCPU_HSR,            offsetof(struct kvm_vcpu, arch.hsr));
 -  DEFINE(VCPU_HxFAR,          offsetof(struct kvm_vcpu, arch.hxfar));
 -  DEFINE(VCPU_HPFAR,          offsetof(struct kvm_vcpu, arch.hpfar));
 -  DEFINE(VCPU_HYP_PC,         offsetof(struct kvm_vcpu, arch.hyp_pc));
 +  DEFINE(VCPU_HSR,            offsetof(struct kvm_vcpu, arch.fault.hsr));
 +  DEFINE(VCPU_HxFAR,          offsetof(struct kvm_vcpu, arch.fault.hxfar));
 +  DEFINE(VCPU_HPFAR,          offsetof(struct kvm_vcpu, arch.fault.hpfar));
 +  DEFINE(VCPU_HYP_PC,         offsetof(struct kvm_vcpu, arch.fault.hyp_pc));
  #ifdef CONFIG_KVM_ARM_VGIC
    DEFINE(VCPU_VGIC_CPU,               offsetof(struct kvm_vcpu, arch.vgic_cpu));
    DEFINE(VGIC_CPU_HCR,                offsetof(struct vgic_cpu, vgic_hcr));