From: Arnd Bergmann <arnd@arndb.de> To: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: David Vrabel <david.vrabel@citrix.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, 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 [thread overview] Message-ID: <3837965.uXvcfKiP40@wuerfel> (raw) 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 <arnd@arndb.de> 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);
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] xen: fix building on ARM with CONFIG_HIBERNATE_CALLBACKS Date: Tue, 19 May 2015 14:58:42 +0200 [thread overview] Message-ID: <3837965.uXvcfKiP40@wuerfel> (raw) 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 <arnd@arndb.de> 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);
next reply other threads:[~2015-05-19 12:59 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-19 12:58 Arnd Bergmann [this message] 2015-05-19 12:58 ` [PATCH] xen: fix building on ARM with CONFIG_HIBERNATE_CALLBACKS Arnd Bergmann 2015-05-19 13:57 ` Boris Ostrovsky 2015-05-19 13:57 ` Boris Ostrovsky 2015-05-19 13:57 ` Boris Ostrovsky 2015-05-19 14:36 ` Arnd Bergmann 2015-05-19 14:36 ` Arnd Bergmann 2015-05-19 14:36 ` Arnd Bergmann 2015-05-19 14:49 ` Boris Ostrovsky 2015-05-19 14:49 ` Boris Ostrovsky 2015-05-19 14:49 ` Boris Ostrovsky 2015-05-19 15:15 ` David Vrabel 2015-05-19 15:15 ` David Vrabel 2015-05-19 15:15 ` David Vrabel 2015-05-19 12:58 Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=3837965.uXvcfKiP40@wuerfel \ --to=arnd@arndb.de \ --cc=boris.ostrovsky@oracle.com \ --cc=david.vrabel@citrix.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=stefano.stabellini@eu.citrix.com \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.