| Message ID | 1469481288-2378-1-git-send-email-boris.ostrovsky@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25/07/16 23:14, Boris Ostrovsky wrote: > xen_smp_intr_init() and xen_smp_intr_free() are now called from > enlighten.c and therefore not guaranteed to have CONFIG_SMP. > > Instead of adding multiple ifdefs there provide stubs in smp.h > > Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Reviewed-by: Juergen Gross <jgross@suse.com> Juergen
diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h index 45faaf3..a1918d8 100644 --- a/arch/x86/xen/smp.h +++ b/arch/x86/xen/smp.h @@ -1,5 +1,6 @@ #ifndef _XEN_SMP_H +#ifdef CONFIG_SMP extern void xen_send_IPI_mask(const struct cpumask *mask, int vector); extern void xen_send_IPI_mask_allbutself(const struct cpumask *mask, @@ -19,4 +20,12 @@ static inline void xen_pvh_early_cpu_init(int cpu, bool entry) } #endif +#else /* CONFIG_SMP */ +static inline int xen_smp_intr_init(unsigned int cpu) +{ + return 0; +} +static inline void xen_smp_intr_free(unsigned int cpu) {} +#endif /* CONFIG_SMP */ + #endif
xen_smp_intr_init() and xen_smp_intr_free() are now called from enlighten.c and therefore not guaranteed to have CONFIG_SMP. Instead of adding multiple ifdefs there provide stubs in smp.h Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- The patch is against tip:smp/hotplug which is broken by https://lists.xenproject.org/archives/html/xen-devel/2016-03/msg02301.html arch/x86/xen/smp.h | 9 +++++++++ 1 file changed, 9 insertions(+)