diff options
| author | Sebastian Reichel <[email protected]> | 2025-07-06 22:53:35 +0000 |
|---|---|---|
| committer | Sebastian Reichel <[email protected]> | 2025-07-06 22:53:35 +0000 |
| commit | 61b8c39deb4b6d314f942a4a33565575c9b0c3d5 (patch) | |
| tree | f25268cdd9485af13d9efa05db3d88754a82f82b /arch/arm64/kvm/debug.c | |
| parent | MAINTAINERS: rectify file entry in QUALCOMM SMB CHARGER DRIVER (diff) | |
| parent | Documentation: PM: *_autosuspend() functions update last busy time (diff) | |
| download | kernel-61b8c39deb4b6d314f942a4a33565575c9b0c3d5.tar.gz kernel-61b8c39deb4b6d314f942a4a33565575c9b0c3d5.zip | |
Merge tag 'pm-runtime-6.17-rc1'
Runtime PM updates related to autosuspend for 6.17
Make several autosuspend functions mark last busy stamp and update
the documentation accordingly (Sakari Ailus).
Signed-off-by: Sebastian Reichel <[email protected]>
Diffstat (limited to 'arch/arm64/kvm/debug.c')
| -rw-r--r-- | arch/arm64/kvm/debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c index 0e4c805e7e89..1a7dab333f55 100644 --- a/arch/arm64/kvm/debug.c +++ b/arch/arm64/kvm/debug.c @@ -216,9 +216,9 @@ void kvm_debug_set_guest_ownership(struct kvm_vcpu *vcpu) void kvm_debug_handle_oslar(struct kvm_vcpu *vcpu, u64 val) { if (val & OSLAR_EL1_OSLK) - __vcpu_sys_reg(vcpu, OSLSR_EL1) |= OSLSR_EL1_OSLK; + __vcpu_rmw_sys_reg(vcpu, OSLSR_EL1, |=, OSLSR_EL1_OSLK); else - __vcpu_sys_reg(vcpu, OSLSR_EL1) &= ~OSLSR_EL1_OSLK; + __vcpu_rmw_sys_reg(vcpu, OSLSR_EL1, &=, ~OSLSR_EL1_OSLK); preempt_disable(); kvm_arch_vcpu_put(vcpu); |