From patchwork Wed Nov 1 14:03:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 10036339 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 B8A0F6032D for ; Wed, 1 Nov 2017 14:05:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94CEF28BB8 for ; Wed, 1 Nov 2017 14:05:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89AA428BBA; Wed, 1 Nov 2017 14:05:56 +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 1A16728BB8 for ; Wed, 1 Nov 2017 14:05:55 +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 1e9tc6-0007t9-Fb; Wed, 01 Nov 2017 14:03:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e9tc5-0007sx-Rj for xen-devel@lists.xen.org; Wed, 01 Nov 2017 14:03:25 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 68/C7-10698-D24D9F95; Wed, 01 Nov 2017 14:03:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRWlGSWpSXmKPExsVyMbThoK7OlZ+ RBgeeCFss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlnPy9nLPjOVTH/m1QD41v2LkYuDiGBiYwS j1eeYgZxWATmMUvMafoLlpEQ6GeV2LHtGlsXIyeQkydxddc/dgg7TeLitJdMEHa1xMfm56xdj BxAo9Qk1ryJgpjazSRx6/lUZpA4m4COxLoZtSDlIgLSEtc+X2YEsZkFIiTOfzgINl5YIEpi6c VVYONZBFQlFtx+wAxi8wrYSBz9vAFqlbzErraLYKs4BWwlll0xBwkLAZXcbjjBPoFRcAEjwyp GjeLUorLUIl1Dc72kosz0jJLcxMwcXUMDY73c1OLixPTUnMSkYr3k/NxNjMBgYwCCHYwvT3se YpTkYFIS5d3p+D1SiC8pP6UyI7E4I76oNCe1+BCjDAeHkgTvkUs/I4UEi1LTUyvSMnOAYQ+Tl uDgURLhXQ2S5i0uSMwtzkyHSJ1idOW4cOfSHyaOY5suA8kDe24ByY6bd4Hks5mvG5iFWPLy81 KlxHmfgTQLgDRnlObBjYbF7CVGWSlhXkagY4V4ClKLcjNLUOVfMYpzMCoJ8x4HmcKTmVcCd8E roOOYgI7zkvgBclxJIkIKmAZmXNgc8cjo+pVH5bN0i3XiZ/w66MQr/lYkxPqVyIS5U1L+Wco/ XBFzUThRwvQFw9mMiSyL/0xeU3+uY+WGQLf4uQrT9RvLtIr43juuvntu29c3h9wFDqmuMBCpn 5Dwetah20Gq/cv5GdW+7ljvMUGkflMF99+vp07KN/038XEOv5Xwe+2D1rgCJZbijERDLeai4k QAWE4YyNQCAAA= X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-10.tower-31.messagelabs.com!1509545004!112264772!1 X-Originating-IP: [209.85.128.193] 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 17065 invoked from network); 1 Nov 2017 14:03:24 -0000 Received: from mail-wr0-f193.google.com (HELO mail-wr0-f193.google.com) (209.85.128.193) by server-10.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 1 Nov 2017 14:03:24 -0000 Received: by mail-wr0-f193.google.com with SMTP id z55so2059299wrz.1 for ; Wed, 01 Nov 2017 07:03:24 -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=yZX5LdkSkSwGs8ZO9hc2BGe1K4hxikSYE3t3CEV9r+I=; b=jLaaJoPZEpUkq/2m4tG6/eu02okn1QhVrphoTlH3SyJEXPZXbaN206YHyEHAORk/Uo mcItTBswfiEiFHZTBkORTA3H+UrB0u1dl+mdJF/asNNoaXQ8xius42CDrA2IgKWcdK4+ 6G8vCveh7UorPbHS57HC0pqaRKo9uoylfaZrA= 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=yZX5LdkSkSwGs8ZO9hc2BGe1K4hxikSYE3t3CEV9r+I=; b=bnqOSd1p00HreHfHKY3vNRW4EYGbHqPD8qSwe27OYINd3iSpCN+TK9bHvSRBQcdWO7 4G809CmFYZnpJXhdmuv+C8xS0ta+v6tSU9mqPeXlCYdGFfswVQ2chVXufl4wemxupQcf wB2+2H4fRITScvp9zwG0IMJ1/vE8+of1Mg+KgvQX72D+PLq12X/vxYYB6cEqUk4HN4Rp zhotyhb4lIXKJQeNmlyBwRLbmYQ7wpMfXXQcNLRMfxwt2XikpiSN70G1lvT41rrZ7+1k jUQIEI48ySAdH2tXYyhClZDBUjtyGF9lh0PaUJ2a8Lurpy4rqVxlb/WF7vs/OVnnwqB6 cvVA== X-Gm-Message-State: AMCzsaWvRP9B9xHvOqIkS9TqOTi8lV7XN6JvG3pSadAdNNCzF5aPmr+E Fblx1cCuZ8uLbacs4boxDO/+7eea+no= X-Google-Smtp-Source: ABhQp+QaJN4CdYs8mNKuT+/wgRHsBgaEzj8Qlhd8CBiuVwyw6C2EsDT5qMiGe8q6yIQ+aaNi+AIdLQ== X-Received: by 10.223.176.115 with SMTP id g48mr5501801wra.177.1509545003552; Wed, 01 Nov 2017 07:03:23 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com ([2001:41d0:1:6c23::1]) by smtp.gmail.com with ESMTPSA id w4sm595582wrc.17.2017.11.01.07.03.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Nov 2017 07:03:22 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 1 Nov 2017 14:03:14 +0000 Message-Id: <20171101140316.31333-3-julien.grall@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171101140316.31333-1-julien.grall@linaro.org> References: <20171101140316.31333-1-julien.grall@linaro.org> Cc: Julien Grall , Stefano Stabellini Subject: [Xen-devel] [PATCH v3 for-next 2/4] 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 follow-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 Changes in v3: - Fix typo in the commit message --- 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)