From patchwork Wed Oct 4 18:15:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9985275 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 89BBA605A8 for ; Wed, 4 Oct 2017 18:17:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80E8228BD4 for ; Wed, 4 Oct 2017 18:17:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75DAB28BD7; Wed, 4 Oct 2017 18:17:41 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID 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 33EA028BD5 for ; Wed, 4 Oct 2017 18:17:41 +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 1dzoCp-0001zn-8Z; Wed, 04 Oct 2017 18:15:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzoCo-0001z7-Dv for xen-devel@lists.xen.org; Wed, 04 Oct 2017 18:15:38 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id C3/ED-09852-94525D95; Wed, 04 Oct 2017 18:15:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFIsWRWlGSWpSXmKPExsVyMfTGRl1P1au RBrdvMVos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBnnG2YyF+zkqmj7M4OxgfEYexcjF4eQwCRG icWTprGAOCwC85glbm1ez9jFyMkhIdDPKnFopT+EnSfRdq6XFcJOk3hz6QxQAweQXSXx7Z8gi CkkoCax5k0UxMx+Jok365eygsTZBHQk1s2oBekUEZCWuPb5Mth0ZoEIifMfDrKBlAgL+EmsXc YOEmYRUJW4924CmM0rYC3RfmYm1DHyErvaLoIdwClgIzFrSjtYXAiopq/9NOsERsEFjAyrGDW KU4vKUot0Dc30kooy0zNKchMzc3QNDUz1clOLixPTU3MSk4r1kvNzNzECQ40BCHYwTn0fd4hR koNJSZR3lvzVSCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvEEqQDnBotT01Iq0zBxg0MOkJTh4l ER4U0DSvMUFibnFmekQqVOM9hwX7lz6w8RxbNNlIHlgzy0g2XHz7h8mIZa8/LxUKXHeVpA2AZ C2jNI8uKGwKL3EKCslzMsIdKYQT0FqUW5mCar8K0ZxDkYlYV5TkCk8mXklcLtfAZ3FBHTWnKY rIGeVJCKkpBoYjTYWG0hdY76lJjwpYiY/r6ejaebfPQ/Em99PT/ulzXvldPCupZL91XxfTQ0a b4dt116xNyH4qvyEsrBIpjvF1U1SM0rbmCOtRF1Yki6qPbzdGv/dVHl343yVM3f2LRc6OVXEq Pll1J3m62Il4RHHtT7c8dYVZdTlf9/PeH/3rMguZhndBEklluKMREMt5qLiRABctmFzzQIAAA == X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-13.tower-206.messagelabs.com!1507140936!99092057!1 X-Originating-IP: [209.85.216.177] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47167 invoked from network); 4 Oct 2017 18:15:36 -0000 Received: from mail-qt0-f177.google.com (HELO mail-qt0-f177.google.com) (209.85.216.177) by server-13.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 4 Oct 2017 18:15:36 -0000 Received: by mail-qt0-f177.google.com with SMTP id f15so20916039qtf.7 for ; Wed, 04 Oct 2017 11:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+k2UxqB0X1AeCLQscuVEzKPYeWpws8w3xDjv/fTOxJ0=; b=XyazK7rqzEmYbc6frl7rJTC71BSoDaB4zU+EHoxNKcPHPhXSdx2m8B3cIBUjZQq76i jhrOyRFvByimD+0WmgRjgSfDnxhcH9nL4MsFhCsuYrhPbA8rkJy94u/2PFsFBh2NExSz mK/le9jL5mH8cgh644v502jcCRf3/26LxeQpI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+k2UxqB0X1AeCLQscuVEzKPYeWpws8w3xDjv/fTOxJ0=; b=RmUEAvHbiwVE06TOj775+SHRjw1BKevdJRODkGZehplejxOvow3Nucmf0VsuFKXK4g Y4xkDN2oCZZ8HbpCRkjYZrELI8EonnqVcGmbxXUiYswqao2E3MOHDqX3ZaMM4OZu0NI4 i11c3dv/oupU+UuFgTo7V1PbOhWHVJUl8Do/tDnmZSWrPXtbSBxR6sO2MCS/HvaBceNf cjo9q3t+FSx9T4eFmeiZ5rkWzq70jfK5eIdHcN29T6/gXVSDtc0mH/warihtp9mbcthI u5L9YCkPyFfs2LXD2Cjfz/zBx2kD+PxzyrAXjiT6bj9/xJE/SEgtpcOW5ZAU/4ytdjvH xdKw== X-Gm-Message-State: AMCzsaXP/JxhaUHf9PlR3iGpA+tUfPcPIITtakUiPUr24qydTkMLTuMd W57qvIEvFD7M/720OIu6JiMAFhhvsIk= X-Google-Smtp-Source: AOwi7QAtHGnvPzO4Pz3IgPnh+3tNe9dU79JZIBFzALHsS2Or1zlnrtvQeZN2Qxl33INmZFf8/4e/uw== X-Received: by 10.200.33.235 with SMTP id 40mr29700782qtz.185.1507140935857; Wed, 04 Oct 2017 11:15:35 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com ([2001:41d0:1:6c23::1]) by smtp.gmail.com with ESMTPSA id l188sm10210622qkd.43.2017.10.04.11.15.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Oct 2017 11:15:35 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 4 Oct 2017 19:15:21 +0100 Message-Id: <20171004181526.9405-3-julien.grall@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171004181526.9405-1-julien.grall@linaro.org> References: <20171004181526.9405-1-julien.grall@linaro.org> Cc: Julien Grall , Stefano Stabellini Subject: [Xen-devel] [PATCH 2/7] xen/arm32: mm: Rework is_xen_heap_page to avoid nameclash 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 The arm32 version of the function is_xen_heap_page currently define a variable _mfn. This will lead to a compiler when use typesafe MFN in a folow-up patch: called object '_mfn' is not a function or function pointer Fix it by renaming the local variable _mfn to mfn_. Signed-off-by: Julien Grall --- Cc: Stefano Stabellini --- xen/include/asm-arm/mm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index cd6dfb54b9..737a429409 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -140,9 +140,9 @@ extern vaddr_t xenheap_virt_start; #ifdef CONFIG_ARM_32 #define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page)) #define is_xen_heap_mfn(mfn) ({ \ - unsigned long _mfn = (mfn); \ - (_mfn >= mfn_x(xenheap_mfn_start) && \ - _mfn < mfn_x(xenheap_mfn_end)); \ + unsigned long mfn_ = (mfn); \ + (mfn_ >= mfn_x(xenheap_mfn_start) && \ + mfn_ < mfn_x(xenheap_mfn_end)); \ }) #else #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)