diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-29 09:10:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-29 09:10:54 +0300 |
| commit | e561bb29b650d2817d10a4858f1817836ed08399 (patch) | |
| tree | 0bc92b5bb8a287a8e4a88732f3c64b56d126da58 /arch/x86/kvm/lapic.c | |
| parent | 62e3a931788223048120357ab3f29dcb55c5ef79 (diff) | |
| parent | 60b548237fed4b4164bab13c994dd9615f6c4323 (diff) | |
| download | linux-e561bb29b650d2817d10a4858f1817836ed08399.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 89db20f8cb70..c4533d05c214 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -55,7 +55,7 @@ #define PRIo64 "o" /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ -#define apic_debug(fmt, arg...) +#define apic_debug(fmt, arg...) do {} while (0) /* 14 is the version for Xeon and Pentium 8.4.8*/ #define APIC_VERSION (0x14UL | ((KVM_APIC_LVT_NUM - 1) << 16)) @@ -576,6 +576,11 @@ int kvm_pv_send_ipi(struct kvm *kvm, unsigned long ipi_bitmap_low, rcu_read_lock(); map = rcu_dereference(kvm->arch.apic_map); + if (unlikely(!map)) { + count = -EOPNOTSUPP; + goto out; + } + if (min > map->max_apic_id) goto out; /* Bits above cluster_size are masked in the caller. */ |