summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChristoffer Dall <cdall@linaro.org>2017-06-17 16:33:02 +0200
committerChristoffer Dall <christoffer.dall@linaro.org>2017-11-06 16:23:11 +0100
commit14d61fa98f03cb01f3aea7e3069fdf460caf5587 (patch)
tree038fa89749fe67fbfc7d0216c4fa015cdf3022c5 /include
parentKVM: arm/arm64: Make timer_arm and timer_disarm helpers more generic (diff)
downloadlinux-14d61fa98f03cb01f3aea7e3069fdf460caf5587.tar.xz
linux-14d61fa98f03cb01f3aea7e3069fdf460caf5587.zip
KVM: arm/arm64: Rename soft timer to bg_timer
As we are about to introduce a separate hrtimer for the physical timer, call this timer bg_timer, because we refer to this timer as the background timer in the code and comments elsewhere. Signed-off-by: Christoffer Dall <cdall@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'include')
-rw-r--r--include/kvm/arm_arch_timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index d0beae98f755..0eed5bc9fd5e 100644
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -43,7 +43,7 @@ struct arch_timer_cpu {
struct arch_timer_context ptimer;
/* Background timer used when the guest is not running */
- struct hrtimer timer;
+ struct hrtimer bg_timer;
/* Work queued with the above timer expires */
struct work_struct expired;