From patchwork Thu Oct 5 17:42:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9987663 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 4DF986029B for ; Thu, 5 Oct 2017 17:45:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 381C928D14 for ; Thu, 5 Oct 2017 17:45:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CDA628D18; Thu, 5 Oct 2017 17:45:03 +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 D1A2428D14 for ; Thu, 5 Oct 2017 17:45:02 +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 1e0AAO-0000yf-OB; Thu, 05 Oct 2017 17:42:36 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0AAN-0000y6-Nu for xen-devel@lists.xen.org; Thu, 05 Oct 2017 17:42:35 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id DF/F8-03409-B0F66D95; Thu, 05 Oct 2017 17:42:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRWlGSWpSXmKPExsVyMfTONl2O/Gu RBn2HNC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozzDTOZC3ZyVbT9mcHYwHiMvYuRi0NIYCKj xIzu+awgDovAPGaJlTvWsIE4EgL9rBLbGvYwdzFyAjl5Et+2HWWDsNMk5nf3s0DYVRKt+zuAa jiARqlJrHkTBTG1j0niwfT/bCBxNgEdiXUzakHKRQSkJa59vswIYjMLREic/3AQbKSwQKDEx9 kvwGwWAVWJGb9ng43nFbCRWL92F9QJ8hK72i6ygticArYS63vusIPYQkA1y1ecZZ7AKLiAkWE Vo0ZxalFZapGuoYleUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7uJkZgwDEAwQ7G6xsD DjFKcjApifJ6ZV2LFOJLyk+pzEgszogvKs1JLT7EKMPBoSTBy58HlBMsSk1PrUjLzAGGPkxag oNHSYRXHiTNW1yQmFucmQ6ROsVoz3HhzqU/TBzHNl0Gkgf23AKSHTfv/mESYsnLz0uVEufdkw vUJgDSllGaBzcUFquXGGWlhHkZgc4U4ilILcrNLEGVf8UozsGoJMx7EGQKT2ZeCdzuV0BnMQG dNafpCshZJYkIKakGRj8t4yemImpnmEunrXzArKgz7Wgr+4yeH1mzvigx+QtdMXc/wB4boCw2 gd020VMwaeE/xvcXtyiEmS7jL64QnaN4oG/unxMfJi1zvcH7vEqOb+bqay/eLjWc+/ev4iv+I 1WJauHXX8zITI3a/suvs+HNn4d7u79fYiiZ87++8WzMcrkwnwcTjiqxFGckGmoxFxUnAgCPuh pu0AIAAA== X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1507225351!109980040!1 X-Originating-IP: [209.85.220.182] 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 16505 invoked from network); 5 Oct 2017 17:42:32 -0000 Received: from mail-qk0-f182.google.com (HELO mail-qk0-f182.google.com) (209.85.220.182) by server-16.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 5 Oct 2017 17:42:32 -0000 Received: by mail-qk0-f182.google.com with SMTP id 17so15471421qkq.8 for ; Thu, 05 Oct 2017 10:42:32 -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=cFYStM7ZFqctzavmRfNEbKhBppBeht4MpkV7ZvYB2ot1JS33l20dNtnfbkTPvqbX17 P5gUYeDTrQErdL0fIrsS350tYx0cYMPiGLcWHL+i3WAV2dFtD26PNYWYNgjuM8BYy1Xq 0XicJ5S3ObpHayXP+6G9Dm4dRk+QxPpEs+e+8= 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=tvchIoGzT5J226WMRiuap3+Nei+U3eDj5XaraWSqmW8KGKvfJDP/pa4OkeS99Nmy4d JfE1wGZc71p6UsLJNEcVcN6H2eDGbK2ajC1ZZjErTrRVpGr8BOvZ/JJA+FEO/6m7RnSu /YvTmf0g5Za9Ai1FgcXxKefTpEWKbdusrK8M/gCusl21a6ZBnJPeRGpFCsYEepj+4aYd D4y6c32S1e139VHhO7pZfuNeu6FChTNn6o0QQf1ghIJBHtm+ghZfnU4XAkW8rR/tORjU Ul3qTV64AjD27frU2HZETwgi5Vpye71R8ajQmpvjEqdai208xtw+Lesqoo7Z05kAsiFj cVuA== X-Gm-Message-State: AMCzsaXjIVCTF+chDXYhaYhvFW09RFpnG2ZERNWr4HnFMq+HsnNJSpaE ITp9C6doZbYyTgURvLWdpbIAY3/03A0= X-Google-Smtp-Source: AOwi7QBpJzK/2T5jU8ICq/YmTV+Vg/TgggWftVL4m3AtY7vaAb9QWlgK92MO9LKTndNA20dFvMvwsg== X-Received: by 10.55.23.101 with SMTP id i98mr29143759qkh.193.1507225351465; Thu, 05 Oct 2017 10:42:31 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com ([2001:41d0:1:6c23::1]) by smtp.gmail.com with ESMTPSA id y63sm11815084qky.75.2017.10.05.10.42.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Oct 2017 10:42:31 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 5 Oct 2017 18:42:15 +0100 Message-Id: <20171005174222.29161-3-julien.grall@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171005174222.29161-1-julien.grall@linaro.org> References: <20171005174222.29161-1-julien.grall@linaro.org> Cc: Julien Grall , Stefano Stabellini Subject: [Xen-devel] [PATCH v2 2/9] 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)