diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 22:25:02 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-12 22:31:37 +1000 |
| commit | 3c19d5ada1bec8b97119215298df7669d3ffb3db (patch) | |
| tree | bbc728296e01ff7403164072e4f87ad01de2c6ea /arch/powerpc/include/asm/kvm_book3s_asm.h | |
| parent | powerpc/powernv: Recover correct PACA on wakeup from a stop on P9 DD1 (diff) | |
| parent | powerpc: Fixup LPCR:PECE and HEIC setting on POWER9 (diff) | |
| download | linux-dev-3c19d5ada1bec8b97119215298df7669d3ffb3db.tar.xz linux-dev-3c19d5ada1bec8b97119215298df7669d3ffb3db.zip | |
Merge branch 'topic/xive' (early part) into next
This merges the arch part of the XIVE support, leaving the final commit
with the KVM specific pieces dangling on the branch for Paul to merge
via the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/include/asm/kvm_book3s_asm.h')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_book3s_asm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h index d318d432caa9..0593d9479f74 100644 --- a/arch/powerpc/include/asm/kvm_book3s_asm.h +++ b/arch/powerpc/include/asm/kvm_book3s_asm.h @@ -110,7 +110,7 @@ struct kvmppc_host_state { u8 ptid; struct kvm_vcpu *kvm_vcpu; struct kvmppc_vcore *kvm_vcore; - unsigned long xics_phys; + void __iomem *xics_phys; u32 saved_xirr; u64 dabr; u64 host_mmcr[7]; /* MMCR 0,1,A, SIAR, SDAR, MMCR2, SIER */ |