From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754284AbcGYVQu (ORCPT ); Mon, 25 Jul 2016 17:16:50 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:39949 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753830AbcGYVQr (ORCPT ); Mon, 25 Jul 2016 17:16:47 -0400 From: Boris Ostrovsky To: david.vrabel@citrix.com, jgross@suse.com, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org, boris.ostrovsky@oracle.com Subject: [PATCH] xen/x86: Define stubs for xen_smp_intr_init/xen_smp_intr_free Date: Mon, 25 Jul 2016 17:14:48 -0400 Message-Id: <1469481288-2378-1-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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