diff options
-rw-r--r-- | arch/x86/kvm/i8254.c | 8 | ||||
-rw-r--r-- | arch/x86/kvm/i8254.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 68af4445d51d..219ef855aae5 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
@@ -264,7 +264,7 @@ static void pit_do_work(struct kthread_work *work) | |||
264 | int i; | 264 | int i; |
265 | struct kvm_kpit_state *ps = &pit->pit_state; | 265 | struct kvm_kpit_state *ps = &pit->pit_state; |
266 | 266 | ||
267 | if (ps->reinject && !atomic_xchg(&ps->irq_ack, 0)) | 267 | if (atomic_read(&ps->reinject) && !atomic_xchg(&ps->irq_ack, 0)) |
268 | return; | 268 | return; |
269 | 269 | ||
270 | kvm_set_irq(kvm, pit->irq_source_id, 0, 1, false); | 270 | kvm_set_irq(kvm, pit->irq_source_id, 0, 1, false); |
@@ -289,7 +289,7 @@ static enum hrtimer_restart pit_timer_fn(struct hrtimer *data) | |||
289 | struct kvm_kpit_state *ps = container_of(data, struct kvm_kpit_state, timer); | 289 | struct kvm_kpit_state *ps = container_of(data, struct kvm_kpit_state, timer); |
290 | struct kvm_pit *pt = pit_state_to_pit(ps); | 290 | struct kvm_pit *pt = pit_state_to_pit(ps); |
291 | 291 | ||
292 | if (ps->reinject) | 292 | if (atomic_read(&ps->reinject)) |
293 | atomic_inc(&ps->pending); | 293 | atomic_inc(&ps->pending); |
294 | 294 | ||
295 | queue_kthread_work(&pt->worker, &pt->expired); | 295 | queue_kthread_work(&pt->worker, &pt->expired); |
@@ -312,7 +312,7 @@ void kvm_pit_set_reinject(struct kvm_pit *pit, bool reinject) | |||
312 | struct kvm_kpit_state *ps = &pit->pit_state; | 312 | struct kvm_kpit_state *ps = &pit->pit_state; |
313 | struct kvm *kvm = pit->kvm; | 313 | struct kvm *kvm = pit->kvm; |
314 | 314 | ||
315 | if (ps->reinject == reinject) | 315 | if (atomic_read(&ps->reinject) == reinject) |
316 | return; | 316 | return; |
317 | 317 | ||
318 | if (reinject) { | 318 | if (reinject) { |
@@ -325,7 +325,7 @@ void kvm_pit_set_reinject(struct kvm_pit *pit, bool reinject) | |||
325 | kvm_unregister_irq_mask_notifier(kvm, 0, &pit->mask_notifier); | 325 | kvm_unregister_irq_mask_notifier(kvm, 0, &pit->mask_notifier); |
326 | } | 326 | } |
327 | 327 | ||
328 | ps->reinject = reinject; | 328 | atomic_set(&ps->reinject, reinject); |
329 | } | 329 | } |
330 | 330 | ||
331 | static void create_pit_timer(struct kvm_pit *pit, u32 val, int is_period) | 331 | static void create_pit_timer(struct kvm_pit *pit, u32 val, int is_period) |
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h index f365dce4fb8d..2f5af0798326 100644 --- a/arch/x86/kvm/i8254.h +++ b/arch/x86/kvm/i8254.h | |||
@@ -31,7 +31,7 @@ struct kvm_kpit_state { | |||
31 | u32 speaker_data_on; | 31 | u32 speaker_data_on; |
32 | 32 | ||
33 | struct mutex lock; | 33 | struct mutex lock; |
34 | bool reinject; | 34 | atomic_t reinject; |
35 | atomic_t pending; /* accumulated triggered timers */ | 35 | atomic_t pending; /* accumulated triggered timers */ |
36 | atomic_t irq_ack; | 36 | atomic_t irq_ack; |
37 | struct kvm_irq_ack_notifier irq_ack_notifier; | 37 | struct kvm_irq_ack_notifier irq_ack_notifier; |