diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:53 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:37:53 +0800 |
| commit | fbb0b56de45bc81681eeeaec29e6c1e3ff12a200 (patch) | |
| tree | b40400c596280b6fe6b03641618bb73d196952c3 /virt/kvm/async_pf.c | |
| parent | 9d8a5571197f43541c8eec6d8d4dcd1ff4deecec (diff) | |
| parent | 19d0bd71d564448446bd851d752caf3e31520ac8 (diff) | |
Merge tag 'v3.10.100' into linux-linaro-lsk-v3.10lsk-v3.10-16.03linux-linaro-lsk-v3.10
This is the 3.10.100 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 d6a3d0993d88..965a818dea75 100644 --- a/virt/kvm/async_pf.c +++ b/virt/kvm/async_pf.c @@ -171,7 +171,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; |