diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:33:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-01 14:34:26 +0800 |
| commit | 439863d92fda525a8f3b326a24490e91c70f0496 (patch) | |
| tree | ec25b3ae200d75f2be939a7da5305537dd9172f9 /virt/kvm/irqchip.c | |
| parent | 43c981bd2d8af8d91726be1fac389cdce47dce1e (diff) | |
| parent | 95123c0b81d9478b8155fe15093b88f57ef7d0bd (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.06
Conflicts:
adopt s/cpufreq_val/cpufreq_freqs in drivers/thermal/cpu_cooling.c
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 1d56a901e791..1470f2aab091 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -51,7 +51,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; |