From patchwork Wed Jun 7 09:34:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9771045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 78F8460350 for ; Wed, 7 Jun 2017 09:37:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72B422624B for ; Wed, 7 Jun 2017 09:37:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6725228471; Wed, 7 Jun 2017 09:37:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 047F32624B for ; Wed, 7 Jun 2017 09:37:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIXMj-0005K9-Bl; Wed, 07 Jun 2017 09:35:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIXMi-0005K3-Ke for xen-devel@lists.xen.org; Wed, 07 Jun 2017 09:35:00 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 7A/27-02955-3C8C7395; Wed, 07 Jun 2017 09:34:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsVysyfVTffwCfN Ig1O/2S2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oyXK26wFEzlrpi+/RFLA+NWzi5GLg4hgU2M Er/n3mODcLYzSjzYN4W1i5GTg01AW2Lq74nMILaIgLTEtc+XGUGKmAUamCSapnUzgiSEBdIkJ h58wARiswioSkzbMo0FxOYVsJJ4u+M2WFxCQF5iV9tFsKGcAtYS1ydsBxsqBFTTd/A5K0SNpM Sek98ZJzDyLGBkWMWoUZxaVJZapGtkqpdUlJmeUZKbmJmja2hgrJebWlycmJ6ak5hUrJecn7u JEej7egYGxh2MrSf8DjFKcjApifJ27TCPFOJLyk+pzEgszogvKs1JLT7EKMPBoSTBGw0MJSHB otT01Iq0zBxgEMKkJTh4lER4XxwBSvMWFyTmFmemQ6ROMSpKifOyg/QJgCQySvPg2mCBf4lRV kqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMO+M40BTeDLzSuCmvwJazAS0mO+SCcjikkSElFQD48 wCsf0zKw9rTjGctu/a6YlGPzZ+uD7r2Hy3xtfOK2omJxmdks3gmbbqxuxvxdVPYxec4jj/RHJ 5CSNT2OMMH5HVrvdb9r2efOpoHvfVrdeTZiq9P6N3RnZ72uUdLJLb3i05Kzxl2zLvV+Kxm18c NPZqWRoQfE+kPSdj3oO4PtYVN0055J40X+pQYinOSDTUYi4qTgQA2K6LgHcCAAA= X-Env-Sender: punit.agrawal@arm.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1496828098!96908146!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10980 invoked from network); 7 Jun 2017 09:34:58 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-31.messagelabs.com with SMTP; 7 Jun 2017 09:34:58 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id ECD0780D; Wed, 7 Jun 2017 02:34:57 -0700 (PDT) Received: from localhost (e105922-lin.cambridge.arm.com [10.1.207.56]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BAE9C3F587; Wed, 7 Jun 2017 02:34:57 -0700 (PDT) From: Punit Agrawal To: xen-devel@lists.xen.org Date: Wed, 7 Jun 2017 10:34:49 +0100 Message-Id: <20170607093449.25607-1-punit.agrawal@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170526111407.13537-4-punit.agrawal@arm.com> References: <20170526111407.13537-4-punit.agrawal@arm.com> X-ARM-No-Footer: FoSSMail Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, Punit Agrawal , tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, ian.jackson@eu.citrix.com Subject: [Xen-devel] [For Xen-4.10 PATCH] Ensure invalidate_icache() definition is visible only when !__ASSEMBLY__ X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit edff605421 introduces an empty invalidate_icache() function in page.h for x86 but mistakenly places it outside the !__ASSEMBLY__ block. This causes build failure on x86. Address this by moving the function definition to within the existing !__ASSEMBLY__ block. Fixes: edff605421 ("Avoid excess icache flushes in populate_physmap() before domain has been created") Signed-off-by: Punit Agrawal --- Hi Stefano, Jan, This commit fixes the build breakage in staging for me. I'm not sure whether staging gets rebased so sending this as a separate commit. Please feel free to fold it in if that makes sense. Once again apologies for the breakage. Punit xen/include/asm-x86/page.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 9b86d5183a..474b9bde78 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -371,10 +371,6 @@ perms_strictly_increased(uint32_t old_flags, uint32_t new_flags) return ((of | (of ^ nf)) == nf); } -#endif /* !__ASSEMBLY__ */ - -#define PAGE_ALIGN(x) (((x) + PAGE_SIZE - 1) & PAGE_MASK) - static inline void invalidate_icache(void) { /* @@ -383,6 +379,10 @@ static inline void invalidate_icache(void) */ } +#endif /* !__ASSEMBLY__ */ + +#define PAGE_ALIGN(x) (((x) + PAGE_SIZE - 1) & PAGE_MASK) + #endif /* __X86_PAGE_H__ */ /*