diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
| commit | 421a8ddd1fc901897eee73965b442af4b4dd7095 (patch) | |
| tree | e9bd7aef46f35c1857700b9c52ad24f6a68f957c /virt/kvm/async_pf.c | |
| parent | 82211c838b558293e48c8fcd816f6609ebc7e4b3 (diff) | |
| parent | d439e869d612dd7a338ac75a4afc3646a5e67370 (diff) | |
Merge tag 'v3.18.29' into linux-linaro-lsk-v3.18lsk-v3.18-16.03
This is the 3.18.29 stable release
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 5ff7f7f2689a..e06785470408 100644 --- a/virt/kvm/async_pf.c +++ b/virt/kvm/async_pf.c @@ -169,7 +169,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; |