diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-29 05:55:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-29 05:55:04 -0400 |
| commit | ffc5fce9a96303c3e16232a6bdf8827af6adb604 (patch) | |
| tree | c8c46b2af268d27e07ee7fad8c283fa7d31b1fb7 /arch/x86/xen | |
| parent | b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc (diff) | |
| parent | 1bdb8970392a68489b469c3a330a1adb5ef61beb (diff) | |
Merge branch 'x86/urgent' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/spinlock.c | 6 |
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; | |||
| 27 | 27 | ||
| 28 | static void xen_qlock_kick(int cpu) | 28 | static void xen_qlock_kick(int cpu) |
| 29 | { | 29 | { |
| 30 | int irq = per_cpu(lock_kicker_irq, cpu); | ||
| 31 | |||
| 32 | /* Don't kick if the target's kicker interrupt is not initialized. */ | ||
| 33 | if (irq == -1) | ||
| 34 | return; | ||
| 35 | |||
| 30 | xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR); | 36 | xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR); |
| 31 | } | 37 | } |
| 32 | 38 | ||