[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-854e9fa5a56a9771fad4701a427e4844d2cbade1@git.kernel.org>
Date: Thu, 28 Jul 2016 08:34:04 -0700
From: tip-bot for Boris Ostrovsky <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, mingo@...nel.org, hpa@...or.com,
tglx@...utronix.de, boris.ostrovsky@...cle.com
Subject: [tip:smp/hotplug] xen/x86: Define stubs for
xen_smp_intr_init/xen_smp_intr_free
Commit-ID: 854e9fa5a56a9771fad4701a427e4844d2cbade1
Gitweb: http://git.kernel.org/tip/854e9fa5a56a9771fad4701a427e4844d2cbade1
Author: Boris Ostrovsky <boris.ostrovsky@...cle.com>
AuthorDate: Mon, 25 Jul 2016 17:14:48 -0400
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 27 Jul 2016 12:38:08 +0200
xen/x86: Define stubs for xen_smp_intr_init/xen_smp_intr_free
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@...cle.com>
Reviewed-by: jgross@...e.com
Cc: xen-devel@...ts.xenproject.org
Cc: david.vrabel@...rix.com
Link: http://lkml.kernel.org/r/1469481288-2378-1-git-send-email-boris.ostrovsky@oracle.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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
Powered by blists - more mailing lists