From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932572AbcG1Pe3 (ORCPT ); Thu, 28 Jul 2016 11:34:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49574 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758729AbcG1PeT (ORCPT ); Thu, 28 Jul 2016 11:34:19 -0400 Date: Thu, 28 Jul 2016 08:34:04 -0700 From: tip-bot for Boris Ostrovsky Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, boris.ostrovsky@oracle.com Reply-To: boris.ostrovsky@oracle.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1469481288-2378-1-git-send-email-boris.ostrovsky@oracle.com> References: <1469481288-2378-1-git-send-email-boris.ostrovsky@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] xen/x86: Define stubs for xen_smp_intr_init/xen_smp_intr_free Git-Commit-ID: 854e9fa5a56a9771fad4701a427e4844d2cbade1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 854e9fa5a56a9771fad4701a427e4844d2cbade1 Gitweb: http://git.kernel.org/tip/854e9fa5a56a9771fad4701a427e4844d2cbade1 Author: Boris Ostrovsky AuthorDate: Mon, 25 Jul 2016 17:14:48 -0400 Committer: Thomas Gleixner 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 Reviewed-by: jgross@suse.com Cc: xen-devel@lists.xenproject.org Cc: david.vrabel@citrix.com Link: http://lkml.kernel.org/r/1469481288-2378-1-git-send-email-boris.ostrovsky@oracle.com Signed-off-by: Thomas Gleixner --- 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