diff options
author | Ingo Molnar | 2016-02-29 09:42:07 +0100 |
---|---|---|
committer | Ingo Molnar | 2016-02-29 09:42:07 +0100 |
commit | 6aa447bcbb444cd1b738613a20627f288d631665 (patch) | |
tree | 62030bb14be0006248181305ac1fe377a99e5b65 /virt/kvm/async_pf.c | |
parent | rcu: Use simple wait queues where possible in rcutree (diff) | |
parent | sched/deadline: Always calculate end of period on sched_yield() (diff) | |
download | kernel-qcow2-linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.gz kernel-qcow2-linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.xz kernel-qcow2-linux-6aa447bcbb444cd1b738613a20627f288d631665.zip |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'virt/kvm/async_pf.c')
-rw-r--r-- | virt/kvm/async_pf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c index 73c1a2a9d5fe..65da997b430a 100644 --- a/virt/kvm/async_pf.c +++ b/virt/kvm/async_pf.c @@ -172,7 +172,7 @@ int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, unsigned long hva, * do alloc nowait since if we are going to sleep anyway we * may as well sleep faulting in page */ - work = kmem_cache_zalloc(async_pf_cache, GFP_NOWAIT); + work = kmem_cache_zalloc(async_pf_cache, GFP_NOWAIT | __GFP_NOWARN); if (!work) return 0; |