Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1449881

[PATCH] xen/x86: Define stubs for xen_smp_intr_init/xen_smp_intr_free

Show all headers | View raw

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(+)

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
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] xen/x86: Define stubs for xen_smp_intr_init/xen_smp_intr_free Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-07-25 23:20 +0200
  Re: [PATCH] xen/x86: Define stubs for  xen_smp_intr_init/xen_smp_intr_free Juergen Gross <jgross@suse.com> - 2016-07-26 07:40 +0200
  [tip:smp/hotplug] xen/x86: Define stubs for  xen_smp_intr_init/xen_smp_intr_free tip-bot for Boris Ostrovsky <tipbot@zytor.com> - 2016-07-28 17:40 +0200

csiph-web