diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-07-09 19:32:20 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-07-09 19:32:48 +1000 |
| commit | ac2a2303016baed1a60343500e265519cc45e4d2 (patch) | |
| tree | 6836287eacfe6cd2cfffc1aeb8fe91218d024857 /arch/powerpc/kernel | |
| parent | 7e74dabc3daf0c217cb5e8e849a8f6c02927950f (diff) | |
| parent | 81e9685dd41384a39adda823df8b4f6e16ec2898 (diff) | |
| download | linux-ac2a2303016baed1a60343500e265519cc45e4d2.tar.bz2 | |
Merge branch 'topic/ppc-kvm' into next
Merge KVM related commits we are keeping in a topic branch in case of
any conflicts with generic KVM changes.
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index eec536aef83a..8c10f536e478 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -379,7 +379,7 @@ int main(void) OFFSET(VCPU_SPRG2, kvm_vcpu, arch.shregs.sprg2); OFFSET(VCPU_SPRG3, kvm_vcpu, arch.shregs.sprg3); #endif -#ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING +#ifdef CONFIG_KVM_BOOK3S_HV_P8_TIMING OFFSET(VCPU_TB_RMENTRY, kvm_vcpu, arch.rm_entry); OFFSET(VCPU_TB_RMINTR, kvm_vcpu, arch.rm_intr); OFFSET(VCPU_TB_RMEXIT, kvm_vcpu, arch.rm_exit); |