From patchwork Tue May 19 12:58:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6436891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E47959F399 for ; Tue, 19 May 2015 13:01:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4685F20376 for ; Tue, 19 May 2015 13:01:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE9552052F for ; Tue, 19 May 2015 13:01:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yuh79-0003Yf-TY; Tue, 19 May 2015 12:59:19 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yuh74-0003NK-Qb for linux-arm-kernel@lists.infradead.org; Tue, 19 May 2015 12:59:15 +0000 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0Lx7w9-1ZENdF3T2X-016hJx; Tue, 19 May 2015 14:58:44 +0200 From: Arnd Bergmann To: Boris Ostrovsky 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 X-Provags-ID: V03:K0:NgpNhhoGk7kCvEmmXBH2FQwhXCrr6PL1v8tSX2iL24DPNH/6Wz4 52giHhhLOhBMpWEAnFEChERTiImmCzBuna5iWQGn9WAmb0TxVimlsY7AybBVmLKdwPntYbT 7OBRaiPJcNma5z5Tg27+gt9KTEbnPvuc2zPddXe0vVhK0jsQ0+lFaY0k2vBNPq1QNg6yCyv 3BlRFBD+Ks3gOguK4L5WA== X-UI-Out-Filterresults: notjunk:1; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150519_055915_212076_70D578C9 X-CRM114-Status: UNSURE ( 9.53 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.1 (-) Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, David Vrabel , linux-arm-kernel@lists.infradead.org, Stefano Stabellini X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);