diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-05 14:45:31 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-05 14:45:31 +0800 |
| commit | 95d4cbea0249e2fe483a981024501cdf7b0de55b (patch) | |
| tree | 7aa71c4a5c65850daa301c90e7f0efd33be63067 /virt | |
| parent | 1b29aa698d3ef8826599dc856054640eb71d2e33 (diff) | |
| parent | e68d6189c7872b2b3731276bda5f5e0c8d5ba644 (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
early call high_memory in arch/arm64/mm/init.c
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index cb092bd9965b..d080f06fd8d9 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -986,7 +986,7 @@ int __kvm_set_memory_region(struct kvm *kvm, * changes) is disallowed above, so any other attribute changes getting * here can be skipped. */ - if ((change == KVM_MR_CREATE) || (change == KVM_MR_MOVE)) { + if (as_id == 0 && (change == KVM_MR_CREATE || change == KVM_MR_MOVE)) { r = kvm_iommu_map_pages(kvm, &new); return r; } |