diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
| commit | ffc4aa8f521606f63f59ff708f49780172909e94 (patch) | |
| tree | 274944bdc4c317e54faa95636c9f1771d8d51b43 /virt/kvm/irqchip.c | |
| parent | 46b4dd0c2535cbb70766f74bb9228ed81f59054d (diff) | |
| parent | 9ca1d50fa959cda1f04f43275f7930a70f1a631e (diff) | |
Merge tag 'v4.4.14' into linux-linaro-lsk-v4.4lsk-v4.4-16.06
This is the 4.4.14 stable release
Diffstat (limited to 'virt/kvm/irqchip.c')
| -rw-r--r-- | virt/kvm/irqchip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index f0b08a2a48ba..7d31d8c5b9ea 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -40,7 +40,7 @@ int kvm_irq_map_gsi(struct kvm *kvm, irq_rt = srcu_dereference_check(kvm->irq_routing, &kvm->irq_srcu, lockdep_is_held(&kvm->irq_lock)); - if (gsi < irq_rt->nr_rt_entries) { + if (irq_rt && gsi < irq_rt->nr_rt_entries) { hlist_for_each_entry(e, &irq_rt->map[gsi], link) { entries[n] = *e; ++n; |