Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932113AbbESM7Z (ORCPT ); Tue, 19 May 2015 08:59:25 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:58715 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755779AbbESM7U (ORCPT ); Tue, 19 May 2015 08:59:20 -0400 From: Arnd Bergmann To: Boris Ostrovsky Cc: David Vrabel , Stefano Stabellini , xen-devel@lists.xenproject.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] xen: fix building on ARM with CONFIG_HIBERNATE_CALLBACKS Date: Tue, 19 May 2015 14:58:42 +0200 Message-ID: <3837965.uXvcfKiP40@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:NgpNhhoGk7kCvEmmXBH2FQwhXCrr6PL1v8tSX2iL24DPNH/6Wz4 52giHhhLOhBMpWEAnFEChERTiImmCzBuna5iWQGn9WAmb0TxVimlsY7AybBVmLKdwPntYbT 7OBRaiPJcNma5z5Tg27+gt9KTEbnPvuc2zPddXe0vVhK0jsQ0+lFaY0k2vBNPq1QNg6yCyv 3BlRFBD+Ks3gOguK4L5WA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1420 Lines: 41 A recent bug fix for x86 broke Xen on ARM for the case that CONFIG_HIBERNATE_CALLBACKS is enabled: drivers/built-in.o: In function `do_suspend': /git/arm-soc/drivers/xen/manage.c:134: undefined reference to `xen_arch_suspend' drivers/built-in.o:(.debug_addr+0xc3f4): undefined reference to `xen_arch_suspend' It is not clear to me what needs to be done here, but this patch avoids the build error by adding a stub for the missing function. Signed-off-by: Arnd Bergmann Fixes: 2b953a5e99 ("xen: Suspend ticks on all CPUs during suspend") --- Please review, and submit an alternate patch if this one turns out to be incorrect. diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 0ce4f32017ea..034dc8acd47e 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -13,7 +13,13 @@ void xen_arch_post_suspend(int suspend_cancelled); void xen_timer_resume(void); void xen_arch_resume(void); +#ifdef CONFIG_X86 void xen_arch_suspend(void); +#else +static inline void xen_arch_suspend(void) +{ +} +#endif void xen_resume_notifier_register(struct notifier_block *nb); void xen_resume_notifier_unregister(struct notifier_block *nb); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/