From patchwork Mon Jun 19 16:57:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 105899 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp942474obh; Mon, 19 Jun 2017 10:00:01 -0700 (PDT) X-Received: by 10.107.184.67 with SMTP id i64mr22439532iof.153.1497891601267; Mon, 19 Jun 2017 10:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497891601; cv=none; d=google.com; s=arc-20160816; b=RY9NjrUQENIStcuHPEOyv0G25Ro8KRK26WUWOmIoilokt5DyNOX7FddNPvQnifSuek HmwVBF0KDOJekANBzgubG79CCIBiTmvUNqhuuRsLwnsCKcCloZG3SXxScPGukR4dx9hR yY6bnsT9MvucuzR3+4HTwKuHvj+auCCljyUtm86ErVHgsdk273v7a0OmgUIulVO2K9nk 6FR08dODfSDyJnf6MUuDRPmTeN8piVBl3me5N3eMU3UJu99eXFFYteESJCItI+/2oO1Z M7uebcvK5s31tYj2tlzlTvgJDzX7aT41FW1lS9LZcdZvMZh6+qmkBs/eUDLkIC3LLgRl Mcpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=vSY0quxkk7e2Fgkcn/pjPP+f8I9ihqcp98xdvDLXntQ=; b=QpNCx7mG9t/PwYAOUmpdZwLf7T0l/xCruIYVyeeqD/F1EFVsw1iMczrFwTDtZiSqSj dUGDvsnZrBaqWWT7l7fNL7eLFmI6jzSXS3yzbFgQw0WMV3pZHBN2H5JpgY7sKUVATg1w WvQmjBx8XynsoFQESPR3ps6AAuDXQhfGuPNx0eo9hkkhY6hihaU3twUqX+KMKyaXxD36 YTukrPe9i/sG9dIpmya3ewx6TmZHjE1zLxTjNa1J/2/da79MakkpBzVnMxm+cfbuVqvl 9iROTge/aKFhEK+jL8aUj+qUipQYhwBTV2B+l1ay6lFq28xivVFROByRINWPcdHgjKw8 dtFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id m127si9222840ite.94.2017.06.19.10.00.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 10:00:01 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dN005-0003hC-Qj; Mon, 19 Jun 2017 16:58:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dN004-0003gf-4J for xen-devel@lists.xen.org; Mon, 19 Jun 2017 16:58:04 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 26/88-11537-B9208495; Mon, 19 Jun 2017 16:58:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTXcWk0e kwbVvehZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0bjpI8sBRN4KzbMmcrewPiMq4uRi0NIYDOj xPXjH1kgnNOMEhu3T2frYuTkYBPQlLjz+RMTiC0iIC1x7fNlRpAiZoFLTBIz/v8G6uDgEBYIl DjW7gtisgioStzvMQEp5xWwlJg1s4EZxJYQkJfY1XaRFcTmFLCS+D7/GiOILQRUc/zJLbYJjN wLGBlWMaoXpxaVpRbpGuslFWWmZ5TkJmbm6BoaGOvlphYXJ6an5iQmFesl5+duYgR6lwEIdjA 2f3E6xCjJwaQkyjvrv3ukEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQneTYwekUKCRanpqRVpmTnA MINJS3DwKInw1vwGauUtLkjMLc5Mh0idYlSUEuc9CdInAJLIKM2Da4OF9iVGWSlhXkagQ4R4C lKLcjNLUOVfMYpzMCoJ8z4FmcKTmVcCN/0V0GImoMXMZ1xAFpckIqSkGhhn/+Pdq//MX27l/Z xX515ukk/2e2R99+EtX5e0BwkKr2zLMu6IRXC3937kYWK2T7Sf2fPU4d+jN79fcJ/MChQ//Mx DUuHKiV3be+UOvTCdeOqAyYM5//oKHv5ZOKle5KTxndcuoZJfnxvaP8ncF5tjvsU6Oy+Vc5Hq xeYD/21/yHYuzL13+6m6EktxRqKhFnNRcSIA2qdxOmgCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1497891482!98806675!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54402 invoked from network); 19 Jun 2017 16:58:02 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-31.messagelabs.com with SMTP; 19 Jun 2017 16:58:02 -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 EDB0E15AD; Mon, 19 Jun 2017 09:58:01 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 351EB3F41F; Mon, 19 Jun 2017 09:58:00 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 19 Jun 2017 17:57:38 +0100 Message-Id: <20170619165753.25049-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170619165753.25049-1-julien.grall@arm.com> References: <20170619165753.25049-1-julien.grall@arm.com> Cc: sstabellini@kernel.org, Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Julien Grall , Jan Beulich , Ian Jackson Subject: [Xen-devel] [PATCH v2 01/16] xen/mm: Don't use _{g, m}fn for defining INVALID_{G, M}FN 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" INVALID_{G,M}FN are defined using static inline helpers _{g,m}fn. This means, they cannot be used to initialize a build time static variable: In file included from mm.c:24:0: xen/xen/include/xen/mm.h:59:26: error: initializer element is not constant #define INVALID_MFN _mfn(~0UL) Signed-off-by: Julien Grall Acked-by: Tim Deegan --- Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Tim Deegan Cc: Wei Liu Changes in v2: - Add Tim's acked - The solution suggested in v1 is also working for non-debug build. So keep the code as it is. --- xen/include/xen/mm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index c9198232e2..e61b6e991c 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -56,7 +56,7 @@ TYPE_SAFE(unsigned long, mfn); #define PRI_mfn "05lx" -#define INVALID_MFN _mfn(~0UL) +#define INVALID_MFN (mfn_t){ ~0UL } #ifndef mfn_t #define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above */ @@ -89,7 +89,7 @@ static inline bool_t mfn_eq(mfn_t x, mfn_t y) TYPE_SAFE(unsigned long, gfn); #define PRI_gfn "05lx" -#define INVALID_GFN _gfn(~0UL) +#define INVALID_GFN (gfn_t){ ~0UL } #ifndef gfn_t #define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above */