From 95bf3430bf14f4ed96d2e61a7ff60d31cd6e4a18 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Wed, 8 May 2013 16:37:35 +0200 Subject: [PATCH] --- yaml --- r: 376435 b: refs/heads/master c: 1db01b4903639fcfaec213701a494fe3fb2c490b h: refs/heads/master i: 376433: 5ebe6577c05a7fb438b28c0b1f79b164c2e05599 376431: fbbdc4b88ae4feea24b3606364be3aec4d4c54dd v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/smp.c | 10 ++++------ trunk/arch/x86/xen/smp.h | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 516ab826c56c..73f26b1f379e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33c1174bae3ea8f420abce53cf8aded778987583 +refs/heads/master: 1db01b4903639fcfaec213701a494fe3fb2c490b diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c index 8ff37995d54e..fb44426fe931 100644 --- a/trunk/arch/x86/xen/smp.c +++ b/trunk/arch/x86/xen/smp.c @@ -576,24 +576,22 @@ void xen_send_IPI_mask_allbutself(const struct cpumask *mask, { unsigned cpu; unsigned int this_cpu = smp_processor_id(); + int xen_vector = xen_map_vector(vector); - if (!(num_online_cpus() > 1)) + if (!(num_online_cpus() > 1) || (xen_vector < 0)) return; for_each_cpu_and(cpu, mask, cpu_online_mask) { if (this_cpu == cpu) continue; - xen_smp_send_call_function_single_ipi(cpu); + xen_send_IPI_one(cpu, xen_vector); } } void xen_send_IPI_allbutself(int vector) { - int xen_vector = xen_map_vector(vector); - - if (xen_vector >= 0) - xen_send_IPI_mask_allbutself(cpu_online_mask, xen_vector); + xen_send_IPI_mask_allbutself(cpu_online_mask, vector); } static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id) diff --git a/trunk/arch/x86/xen/smp.h b/trunk/arch/x86/xen/smp.h index 8981a76d081a..c7c2d89efd76 100644 --- a/trunk/arch/x86/xen/smp.h +++ b/trunk/arch/x86/xen/smp.h @@ -5,7 +5,6 @@ extern void xen_send_IPI_mask(const struct cpumask *mask, extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, int vector); extern void xen_send_IPI_allbutself(int vector); -extern void physflat_send_IPI_allbutself(int vector); extern void xen_send_IPI_all(int vector); extern void xen_send_IPI_self(int vector);