summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/spinlock.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-06-19 02:25:08 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-06-19 02:25:08 +0200
commit6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch)
treec5cd6113ed93854b1bc30cd471c366f080c4be2f /arch/x86/xen/spinlock.c
parentInput: xpad - fix rumble on Xbox One controllers with 2015 firmware (diff)
parentInput: add HDMI CEC specific keycodes (diff)
downloadlinux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.tar.xz
linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.zip
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next merge window.
Diffstat (limited to 'arch/x86/xen/spinlock.c')
-rw-r--r--arch/x86/xen/spinlock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 9e2ba5c6e1dd..f42e78de1e10 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -27,6 +27,12 @@ static bool xen_pvspin = true;
static void xen_qlock_kick(int cpu)
{
+ int irq = per_cpu(lock_kicker_irq, cpu);
+
+ /* Don't kick if the target's kicker interrupt is not initialized. */
+ if (irq == -1)
+ return;
+
xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR);
}