diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2021-06-17 08:51:38 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-06-17 08:51:38 +0200 |
| commit | 3c53642324f526c0aba411bf8e6cf2ab2471192a (patch) | |
| tree | f603ab1fa6c3236618f721806327d4f21a8a1f83 /arch/powerpc/kernel/asm-offsets.c | |
| parent | powerpc/mm/book3s64: Fix possible build error (diff) | |
| parent | KVM: PPC: Book3S HV: remove ISA v3.0 and v3.1 support from P7/8 path (diff) | |
| download | linux-3c53642324f526c0aba411bf8e6cf2ab2471192a.tar.xz linux-3c53642324f526c0aba411bf8e6cf2ab2471192a.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge some powerpc KVM patches from our topic branch.
In particular this brings in Nick's big series rewriting parts of the
guest entry/exit path in C.
Conflicts:
arch/powerpc/kernel/security.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S
Diffstat (limited to 'arch/powerpc/kernel/asm-offsets.c')
| -rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 8599cf4f799c..31881ef3641d 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -473,7 +473,6 @@ int main(void) OFFSET(VCPU_SLB_NR, kvm_vcpu, arch.slb_nr); OFFSET(VCPU_FAULT_DSISR, kvm_vcpu, arch.fault_dsisr); OFFSET(VCPU_FAULT_DAR, kvm_vcpu, arch.fault_dar); - OFFSET(VCPU_FAULT_GPA, kvm_vcpu, arch.fault_gpa); OFFSET(VCPU_INTR_MSR, kvm_vcpu, arch.intr_msr); OFFSET(VCPU_LAST_INST, kvm_vcpu, arch.last_inst); OFFSET(VCPU_TRAP, kvm_vcpu, arch.trap); |