diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-04 14:43:38 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-04 14:43:38 -0700 |
commit | 94865bf8aa24aa359903de3c858a517243e20263 (patch) | |
tree | 950de82b3556dbab5a68a4f17aac8fb21af7c090 /arch/powerpc/include/asm/kvm_host.h | |
parent | 1a621b34f2a4bf8495bf801cd0024f063d561472 (diff) | |
parent | 474271f666ce974ee183057c022325b3833ecb39 (diff) |
Merge tag 'v3.14.43-rt42-lno1' of git://git.linaro.org/people/anders.roxell/linux-rt into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.06-rt
Linux 3.14.43-rt42
Changes since v3.14.39-rt37:
- KVM: lapic: mark LAPIC timer handler as irqsafe
- KVM: use simple waitqueue for vcpu->wq
- hotplug: Use set_cpus_allowed_ptr() in sync_unplug_thread()
- rt, nohz_full: fix nohz_full for PREEMPT_RT_FULL
- kernel/irq_work: fix no_hz deadlock
* tag 'v3.14.43-rt42-lno1' of git://git.linaro.org/people/anders.roxell/linux-rt: (360 commits)
Linux 3.14.43-rt42 REBASE
rt, nohz_full: fix nohz_full for PREEMPT_RT_FULL
hotplug: Use set_cpus_allowed_ptr() in sync_unplug_thread()
KVM: use simple waitqueue for vcpu->wq
KVM: lapic: mark LAPIC timer handler as irqsafe
kernel/irq_work: fix no_hz deadlock
netpoll: guard the access to dev->npinfo with rcu_read_lock/unlock_bh() for CONFIG_PREEMPT_RT_FULL=y
Revert "timers: do not raise softirq unconditionally"
fs,btrfs: fix rt deadlock on extent_buffer->lock
staging: Mark rtl8821ae as broken
timers: Reduce future __run_timers() latency for first add to empty list
timers: Reduce future __run_timers() latency for newly emptied list
timers: Reduce __run_timers() latency for empty list
timers: Track total number of timers in list
fs/aio: simple simple work
lockdep: selftest: fix warnings due to missing PREEMPT_RT conditionals
thermal: Defer thermal wakups to threads
locking: ww_mutex: fix ww_mutex vs self-deadlock
Revert "rwsem-rt: Do not allow readers to nest"
sunrpc: make svc_xprt_do_enqueue() use get_cpu_light()
...
Diffstat (limited to 'arch/powerpc/include/asm/kvm_host.h')
-rw-r--r-- | arch/powerpc/include/asm/kvm_host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h index 7b3907aad2a9..5f7b79002f81 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h @@ -290,7 +290,7 @@ struct kvmppc_vcore { u8 in_guest; struct list_head runnable_threads; spinlock_t lock; - wait_queue_head_t wq; + struct swait_head wq; u64 stolen_tb; u64 preempt_tb; struct kvm_vcpu *runner; @@ -607,7 +607,7 @@ struct kvm_vcpu_arch { u8 prodded; u32 last_inst; - wait_queue_head_t *wqp; + struct swait_head *wqp; struct kvmppc_vcore *vcore; int ret; int trap; |